Merge branch 'azure-pipelines-fixups'

Technically, this topic branch would need a little bit more polishing.
However, it consists largely of fixup! commits which will be squashed
into the original `azure-pipelines` branch, anyway. And v2.20.1 is out
already, so the rebase is imminent. So...

There are two things to do, still, before submitting a new iteration of
that patch series:

- We need a better way to encode the text we paste into the XML.
  Probably we should extend the test-tool.

- We will also want to replace the perl invocation to retrieve the file
  size by a test-tool command.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

azure-pipelines.yml

@@ -162,19 +162,21 @@ phases:
 
 - phase: windows
   displayName: Windows
-  condition: succeeded()
   queue:
     name: Hosted
     timeoutInMinutes: 240
   steps:
   - powershell: |
-       # Helper to check the error level of the latest command (exit with error when appropriate)
-       function c() { if (!$?) { exit(1) } }
-
        if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-         net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no; c
-         cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\; c
+         net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
+         cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
        }
+    displayName: 'Mount test-cache'
+    env:
+      GITFILESHAREPWD: $(gitfileshare.pwd)
+  - powershell: |
+       # Helper to check the error level of the latest command (exit with error when appropriate)
+       function c() { if (!$?) { exit(1) } }
 
        # Add build agent's MinGit to PATH
        $env:PATH = $env:AGENT_HOMEDIRECTORY +"\externals\\git\cmd;" +$env:PATH
@@ -207,26 +209,41 @@ phases:
        init "$sdk_path" "https://dev.azure.com/git-for-windows/git-sdk-64/_git/git-sdk-64" 0
        init usr\src\build-extra https://github.com/git-for-windows/build-extra 1
 
+       # Let Git ignore the SDK and the test-cache
+       "/git-sdk-64/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
+
+       # Help MSYS2 runtime startup by initializing /etc/passwd
+       & "$sdk_path\git-cmd" --command=usr\\bin\\bash.exe -lc "mkpasswd -c >>/etc/passwd"; c
+    displayName: 'Initialize the Git for Windows SDK'
+  - powershell: |
+       # Helper to check the error level of the latest command (exit with error when appropriate)
+       function c() { if (!$?) { exit(1) } }
+
        cd "$(Build.SourcesDirectory)"; c
 
-       $env:HOME = "$(Build.SourcesDirectory)"
-       $env:MSYSTEM = "MINGW64"
        git-sdk-64\git-cmd --command=usr\\bin\\bash.exe -lc @"
-         . ci/lib.sh
+         export MAKEFLAGS=-j10
+         export DEVELOPER=1
+         export NO_PERL=1
+         export NO_SVN_TESTS=1
+         export GIT_TEST_SKIP_REBASE_P=1
 
-         make -j10 DEVELOPER=1 NO_PERL=1 || exit 1
-         NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_SKIP_REBASE_P=1 GIT_TEST_OPTS=\"--no-chain-lint --no-bin-wrappers --quiet --write-junit-xml\" time make -j15 -k DEVELOPER=1 test || {
-           NO_PERL=1 NO_SVN_TESTS=1 GIT_TEST_SKIP_REBASE_P=1 GIT_TEST_OPTS=\"-i -v -x\" make -k -C t failed; exit 1
+         ci/run-build-and-tests.sh || {
+           ci/print-test-failures.sh
+           exit 1
          }
-
-         save_good_tree
        "@
        c
-
+    displayName: 'Build & Test'
+    env:
+      HOME: $(Build.SourcesDirectory)
+      MSYSTEM: MINGW64
+  - powershell: |
        if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
          cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
        }
-    displayName: 'build & test'
+    displayName: 'Unmount test-cache'
+    condition: true
     env:
       GITFILESHAREPWD: $(gitfileshare.pwd)
   - task: PublishTestResults@2

ci/lib.sh

@@ -41,7 +41,9 @@ then
 
 	BREW_INSTALL_PACKAGES=
 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
-	export GIT_TEST_OPTS="--quiet --write-junit-xml"
+	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
+	test windows_nt != "$CI_OS_NAME" ||
+	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
 fi
 
 skip_branch_tip_with_tag () {

ci/run-build-and-tests.sh

@@ -5,9 +5,12 @@
 
 . ${0%/*}/lib.sh
 
-ln -s "$cache_dir/.prove" t/.prove
+case "$CI_OS_NAME" in
+windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
+*) ln -s "$cache_dir/.prove" t/.prove;;
+esac
 
-make --jobs=2
+make
 make --quiet test
 if test "$jobname" = "linux-gcc"
 then

t/interop/i5500-git-daemon.sh

@@ -37,4 +37,5 @@ test_expect_success "fetch with $VERSION_B" '
 	test_cmp expect actual
 '
 
+stop_git_daemon
 test_done

t/lib-git-daemon.sh

@@ -13,6 +13,7 @@
 #
 #	test_expect_success ...
 #
+#	stop_git_daemon
 #	test_done
 
 test_tristate GIT_TEST_GIT_DAEMON
@@ -42,7 +43,7 @@ start_git_daemon() {
 
 	mkdir -p "$GIT_DAEMON_DOCUMENT_ROOT_PATH"
 
-	test_atexit 'stop_git_daemon'
+	trap 'code=$?; stop_git_daemon; (exit $code); die' EXIT
 
 	say >&3 "Starting git daemon ..."
 	mkfifo git_daemon_output

t/lib-git-p4.sh

@@ -74,6 +74,15 @@ cli="$TRASH_DIRECTORY/cli"
 git="$TRASH_DIRECTORY/git"
 pidfile="$TRASH_DIRECTORY/p4d.pid"
 
+# Sometimes "prove" seems to hang on exit because p4d is still running
+cleanup () {
+	if test -f "$pidfile"
+	then
+		kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
+	fi
+}
+trap cleanup EXIT
+
 # git p4 submit generates a temp file, which will
 # not get cleaned up if the submission fails.  Don't
 # clutter up /tmp on the test machine.
@@ -132,7 +141,6 @@ start_p4d () {
 		# p4d failed to start
 		return 1
 	fi
-	test_atexit kill_p4d
 
 	# build a p4 user so [email protected] has an entry
 	p4_add_user author

t/t0000-basic.sh

@@ -138,7 +138,6 @@ check_sub_test_lib_test_err () {
 	)
 }
 
-cat >/dev/null <<\DDD
 test_expect_success 'pretend we have a fully passing test suite' "
 	run_sub_test_lib_test full-pass '3 passing tests' <<-\\EOF &&
 	for i in 1 2 3
@@ -825,25 +824,6 @@ test_expect_success 'tests clean up even on failures' "
 	> 1..2
 	EOF
 "
-DDD
-
-test_expect_success 'test_atexit is run' "
-	test_must_fail run_sub_test_lib_test \
-		atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
-	test_expect_success 'tests clean up even after a failure' '
-		> ../../clean-atexit &&
-		test_atexit rm ../../clean-atexit &&
-		> ../../also-clean-atexit &&
-		test_atexit rm ../../also-clean-atexit &&
-		> ../../dont-clean-atexit &&
-		(exit 1)
-	'
-	test_done
-	EOF
-	test_path_exists dont-clean-atexit &&
-	test_path_is_missing clean-atexit &&
-	test_path_is_missing also-clean-atexit
-"
 
 test_expect_success 'test_oid setup' '
 	test_oid_init

t/t5570-git-daemon.sh

@@ -211,4 +211,5 @@ test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
 	test_cmp expect actual
 '
 
+stop_git_daemon
 test_done

t/t9800-git-p4-basic.sh

@@ -326,4 +326,8 @@ test_expect_success 'submit from worktree' '
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done

t/t9801-git-p4-branch.sh

@@ -610,4 +610,8 @@ test_expect_success 'Update a file in git side and submit to P4 using client vie
 	)
 '
 
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
 test_done