1 file changed, 11 insertions, 18 deletions

diff --git a/tests/setup.sh b/tests/setup.shindex 757ae04..de4fcc6 100755--- a/tests/setup.sh+++ b/tests/setup.sh@@ -6,16 +6,13 @@ # CGIT_TEST_NO_CREATE_REPOS to get the helpers without paying for the fixtures.  # The Git test library would run every Git command under Valgrind if it saw-# --valgrind, and only cgit itself is worth watching, so the option is taken out-# here and acted on further down. The arguments are carried across as a newline-# separated list, which keeps any other whitespace in them intact but assumes-# that none holds a newline of its own.+# --valgrind, and only cgit is worth watching, so the option is taken out+# here and acted on further down. LF=' '-# Trash directories are collected under one trash/ rather than left beside-# the scripts, which keeps the ignore and clean rules to a single plain-# name. The option is seeded ahead of the real arguments so one given on-# the command line still wins.+# Trash directories are collected under one trash/, which keeps the ignore+# and clean rules to a single name. Seeded ahead of the real arguments so+# one given on the command line still wins. test_argv="${LF}--root=trash"  while test $# != 0@@ -45,17 +42,15 @@ TEST_NO_CREATE_REPO=YesPlease . "$TEST_DIRECTORY"/test-lib.sh  # The library spells its results directory test-results and derives these-# variables before it can be told otherwise, so they are re-pointed here and-# every count lands under the plainer results/ instead. The rarely used-# --tee and --stress options write their raw logs before this line and keep-# the library's own name.+# variables before it can be told otherwise, so they are re-pointed at the+# plainer results/. The --tee and --stress raw logs write earlier and keep+# the library's name. TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/results" TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME$TEST_STRESS_JOB_SFX" TEST_RESULTS_SAN_DIR="$TEST_RESULTS_BASE.$TEST_RESULTS_SAN_DIR_SFX" -# The library has moved into the trash directory by now, so everything the-# tests reach outside it is anchored to TEST_OUTPUT_DIRECTORY, which still-# names this directory whatever depth the trash sits at.+# The library has moved into the trash directory by now, so paths outside+# it are anchored to TEST_OUTPUT_DIRECTORY.  # The tests run cgit by name, so the binary just built has to come ahead of any # copy already installed. Under Valgrind the wrappers take that place instead.@@ -138,9 +133,7 @@ enable-filter-overrides=1  repo.url=foo repo.path=$PWD/repos/foo/.git-# Do not specify a description for this repo, as it then will be assigned-# the constant value "[no description]" (which actually used to cause a-# segfault).+# No repo.desc here, so the [no description] default gets exercised.  repo.url=bar repo.path=$PWD/repos/bar/.git
diff --git a/tests/setup.sh b/tests/setup.sh
index 757ae04..de4fcc6 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -6,16 +6,13 @@
 # CGIT_TEST_NO_CREATE_REPOS to get the helpers without paying for the fixtures.
 
 # The Git test library would run every Git command under Valgrind if it saw
-# --valgrind, and only cgit itself is worth watching, so the option is taken out
-# here and acted on further down. The arguments are carried across as a newline
-# separated list, which keeps any other whitespace in them intact but assumes
-# that none holds a newline of its own.
+# --valgrind, and only cgit is worth watching, so the option is taken out
+# here and acted on further down.
 LF='
 '
-# Trash directories are collected under one trash/ rather than left beside
-# the scripts, which keeps the ignore and clean rules to a single plain
-# name. The option is seeded ahead of the real arguments so one given on
-# the command line still wins.
+# Trash directories are collected under one trash/, which keeps the ignore
+# and clean rules to a single name. Seeded ahead of the real arguments so
+# one given on the command line still wins.
 test_argv="${LF}--root=trash"
 
 while test $# != 0
@@ -45,17 +42,15 @@ TEST_NO_CREATE_REPO=YesPlease
 . "$TEST_DIRECTORY"/test-lib.sh
 
 # The library spells its results directory test-results and derives these
-# variables before it can be told otherwise, so they are re-pointed here and
-# every count lands under the plainer results/ instead. The rarely used
-# --tee and --stress options write their raw logs before this line and keep
-# the library's own name.
+# variables before it can be told otherwise, so they are re-pointed at the
+# plainer results/. The --tee and --stress raw logs write earlier and keep
+# the library's name.
 TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/results"
 TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME$TEST_STRESS_JOB_SFX"
 TEST_RESULTS_SAN_DIR="$TEST_RESULTS_BASE.$TEST_RESULTS_SAN_DIR_SFX"
 
-# The library has moved into the trash directory by now, so everything the
-# tests reach outside it is anchored to TEST_OUTPUT_DIRECTORY, which still
-# names this directory whatever depth the trash sits at.
+# The library has moved into the trash directory by now, so paths outside
+# it are anchored to TEST_OUTPUT_DIRECTORY.
 
 # The tests run cgit by name, so the binary just built has to come ahead of any
 # copy already installed. Under Valgrind the wrappers take that place instead.
@@ -138,9 +133,7 @@ enable-filter-overrides=1
 
 repo.url=foo
 repo.path=$PWD/repos/foo/.git
-# Do not specify a description for this repo, as it then will be assigned
-# the constant value "[no description]" (which actually used to cause a
-# segfault).
+# No repo.desc here, so the [no description] default gets exercised.
 
 repo.url=bar
 repo.path=$PWD/repos/bar/.git