Change the GETTEXT_POISON compile-time + runtime GIT_GETTEXT_POISON test parameter to only be a GIT_TEST_GETTEXT_POISON=<non-empty?> runtime parameter, to be consistent with other parameters documented in "Running tests with special setups" in t/README. When I added GETTEXT_POISON inbb946bba76("i18n: add GETTEXT_POISON to simulate unfriendly translator", 2011-02-22) I was concerned with ensuring that the _() function would get constant folded if NO_GETTEXT was defined, and likewise that GETTEXT_POISON would be compiled out unless it was defined. But as the benchmark in my [1] shows doing a one-off runtime getenv("GIT_TEST_[...]") is trivial, and since GETTEXT_POISON was originally added the GIT_TEST_* env variables have become the common idiom for turning on special test setups. So change GETTEXT_POISON to work the same way. Now the GETTEXT_POISON=YesPlease compile-time option is gone, and running the tests with GIT_TEST_GETTEXT_POISON=[YesPlease|] can be toggled on/off without recompiling. This allows for conditionally amending tests to test with/without poison, similar to what859fdc0c3c("commit-graph: define GIT_TEST_COMMIT_GRAPH", 2018-08-29) did for GIT_TEST_COMMIT_GRAPH. Do some of that, now we e.g. always run the t0205-gettext-poison.sh test. I did enough there to remove the GETTEXT_POISON prerequisite, but its inverse C_LOCALE_OUTPUT is still around, and surely some tests using it can be converted to e.g. always set GIT_TEST_GETTEXT_POISON=. Notes on the implementation: * We still compile a dedicated GETTEXT_POISON build in Travis CI. Perhaps this should be revisited and integrated into the "linux-gcc" build, seeae59a4e44f("travis: run tests with GIT_TEST_SPLIT_INDEX", 2018-01-07) for prior art in that area. Then again maybe not, see [2]. * We now skip a test in t0000-basic.sh under GIT_TEST_GETTEXT_POISON=YesPlease that wasn't skipped before. This test relies on C locale output, but due to an edge case in how the previous implementation of GETTEXT_POISON worked (reading it from GIT-BUILD-OPTIONS) wasn't enabling poison correctly. Now it does, and needs to be skipped. * The getenv() function is not reentrant, so out of paranoia about code of the form: printf(_("%s"), getenv("some-env")); call use_gettext_poison() in our early setup in git_setup_gettext() so we populate the "poison_requested" variable in a codepath that's won't suffer from that race condition. * We error out in the Makefile if you're still saying GETTEXT_POISON=YesPlease to prompt users to change their invocation. * We should not print out poisoned messages during the test initialization itself to keep it more readable, so the test library hides the variable if set in $GIT_TEST_GETTEXT_POISON_ORIG during setup. See [3]. See also [4] for more on the motivation behind this patch, and the history of the GETTEXT_POISON facility. 1. https://public-inbox.org/git/871s8gd32p.fsf@evledraar.gmail.com/ 2. https://public-inbox.org/git/20181102163725.GY30222@szeder.dev/ 3. https://public-inbox.org/git/20181022202241.18629-2-szeder.dev@gmail.com/ 4. https://public-inbox.org/git/878t2pd6yu.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			130 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			130 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
# Library of functions shared by all CI scripts
 | 
						|
 | 
						|
skip_branch_tip_with_tag () {
 | 
						|
	# Sometimes, a branch is pushed at the same time the tag that points
 | 
						|
	# at the same commit as the tip of the branch is pushed, and building
 | 
						|
	# both at the same time is a waste.
 | 
						|
	#
 | 
						|
	# Travis gives a tagname e.g. v2.14.0 in $TRAVIS_BRANCH when
 | 
						|
	# the build is triggered by a push to a tag.  Let's see if
 | 
						|
	# $TRAVIS_BRANCH is exactly at a tag, and if so, if it is
 | 
						|
	# different from $TRAVIS_BRANCH.  That way, we can tell if
 | 
						|
	# we are building the tip of a branch that is tagged and
 | 
						|
	# we can skip the build because we won't be skipping a build
 | 
						|
	# of a tag.
 | 
						|
 | 
						|
	if TAG=$(git describe --exact-match "$TRAVIS_BRANCH" 2>/dev/null) &&
 | 
						|
		test "$TAG" != "$TRAVIS_BRANCH"
 | 
						|
	then
 | 
						|
		echo "$(tput setaf 2)Tip of $TRAVIS_BRANCH is exactly at $TAG$(tput sgr0)"
 | 
						|
		exit 0
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
# Save some info about the current commit's tree, so we can skip the build
 | 
						|
# job if we encounter the same tree again and can provide a useful info
 | 
						|
# message.
 | 
						|
save_good_tree () {
 | 
						|
	echo "$(git rev-parse $TRAVIS_COMMIT^{tree}) $TRAVIS_COMMIT $TRAVIS_JOB_NUMBER $TRAVIS_JOB_ID" >>"$good_trees_file"
 | 
						|
	# limit the file size
 | 
						|
	tail -1000 "$good_trees_file" >"$good_trees_file".tmp
 | 
						|
	mv "$good_trees_file".tmp "$good_trees_file"
 | 
						|
}
 | 
						|
 | 
						|
# Skip the build job if the same tree has already been built and tested
 | 
						|
# successfully before (e.g. because the branch got rebased, changing only
 | 
						|
# the commit messages).
 | 
						|
skip_good_tree () {
 | 
						|
	if ! good_tree_info="$(grep "^$(git rev-parse $TRAVIS_COMMIT^{tree}) " "$good_trees_file")"
 | 
						|
	then
 | 
						|
		# Haven't seen this tree yet, or no cached good trees file yet.
 | 
						|
		# Continue the build job.
 | 
						|
		return
 | 
						|
	fi
 | 
						|
 | 
						|
	echo "$good_tree_info" | {
 | 
						|
		read tree prev_good_commit prev_good_job_number prev_good_job_id
 | 
						|
 | 
						|
		if test "$TRAVIS_JOB_ID" = "$prev_good_job_id"
 | 
						|
		then
 | 
						|
			cat <<-EOF
 | 
						|
			$(tput setaf 2)Skipping build job for commit $TRAVIS_COMMIT.$(tput sgr0)
 | 
						|
			This commit has already been built and tested successfully by this build job.
 | 
						|
			To force a re-build delete the branch's cache and then hit 'Restart job'.
 | 
						|
			EOF
 | 
						|
		else
 | 
						|
			cat <<-EOF
 | 
						|
			$(tput setaf 2)Skipping build job for commit $TRAVIS_COMMIT.$(tput sgr0)
 | 
						|
			This commit's tree has already been built and tested successfully in build job $prev_good_job_number for commit $prev_good_commit.
 | 
						|
			The log of that build job is available at https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$prev_good_job_id
 | 
						|
			To force a re-build delete the branch's cache and then hit 'Restart job'.
 | 
						|
			EOF
 | 
						|
		fi
 | 
						|
	}
 | 
						|
 | 
						|
	exit 0
 | 
						|
}
 | 
						|
 | 
						|
check_unignored_build_artifacts ()
 | 
						|
{
 | 
						|
	! git ls-files --other --exclude-standard --error-unmatch \
 | 
						|
		-- ':/*' 2>/dev/null ||
 | 
						|
	{
 | 
						|
		echo "$(tput setaf 1)error: found unignored build artifacts$(tput sgr0)"
 | 
						|
		false
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
# Set 'exit on error' for all CI scripts to let the caller know that
 | 
						|
# something went wrong.
 | 
						|
# Set tracing executed commands, primarily setting environment variables
 | 
						|
# and installing dependencies.
 | 
						|
set -ex
 | 
						|
 | 
						|
cache_dir="$HOME/travis-cache"
 | 
						|
good_trees_file="$cache_dir/good-trees"
 | 
						|
 | 
						|
mkdir -p "$cache_dir"
 | 
						|
 | 
						|
skip_branch_tip_with_tag
 | 
						|
skip_good_tree
 | 
						|
 | 
						|
if test -z "$jobname"
 | 
						|
then
 | 
						|
	jobname="$TRAVIS_OS_NAME-$CC"
 | 
						|
fi
 | 
						|
 | 
						|
export DEVELOPER=1
 | 
						|
export DEFAULT_TEST_TARGET=prove
 | 
						|
export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
 | 
						|
export GIT_TEST_OPTS="--verbose-log -x --immediate"
 | 
						|
export GIT_TEST_CLONE_2GB=YesPlease
 | 
						|
if [ "$jobname" = linux-gcc ]; then
 | 
						|
	export CC=gcc-8
 | 
						|
fi
 | 
						|
 | 
						|
case "$jobname" in
 | 
						|
linux-clang|linux-gcc)
 | 
						|
	export GIT_TEST_HTTPD=YesPlease
 | 
						|
 | 
						|
	# The Linux build installs the defined dependency versions below.
 | 
						|
	# The OS X build installs the latest available versions. Keep that
 | 
						|
	# in mind when you encounter a broken OS X build!
 | 
						|
	export LINUX_P4_VERSION="16.2"
 | 
						|
	export LINUX_GIT_LFS_VERSION="1.5.2"
 | 
						|
 | 
						|
	P4_PATH="$HOME/custom/p4"
 | 
						|
	GIT_LFS_PATH="$HOME/custom/git-lfs"
 | 
						|
	export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
 | 
						|
	;;
 | 
						|
osx-clang|osx-gcc)
 | 
						|
	# t9810 occasionally fails on Travis CI OS X
 | 
						|
	# t9816 occasionally fails with "TAP out of sequence errors" on
 | 
						|
	# Travis CI OS X
 | 
						|
	export GIT_SKIP_TESTS="t9810 t9816"
 | 
						|
	;;
 | 
						|
GIT_TEST_GETTEXT_POISON)
 | 
						|
	export GIT_TEST_GETTEXT_POISON=YesPlease
 | 
						|
	;;
 | 
						|
esac
 |