Add the shared config writers and cgit_rc

The helpers are named by kind. cgitrc_repo and cgitrc_copy write the
config file named first, and cgit_url, cgit_query and cgit_rc run cgit,
each named after what it is handed first. A repository copies its
defaults from the globals read before its repo.url, so cgitrc_repo
places every setting itself, and a global can no longer land where it
silently stops applying. The t00xx and t01xx files move to them here.

1 file changed, 23 insertions, 23 deletions

diff --git a/tests/t0003-cache.sh b/tests/t0003-cache.shindex 17816c3..ec88046 100755--- a/tests/t0003-cache.sh+++ b/tests/t0003-cache.sh@@ -77,9 +77,9 @@ test_expect_success 'set up a repo with a page larger than the output buffer' ' '  test_expect_success 'the first request fills the slot and the second replays it' '-	CGIT_CONFIG="$PWD/bigrc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.first &&+	cgit_rc bigrc "url=bigpage/tree/big.txt" >big.first && 	test $(wc -c <big.first) -gt 65536 &&-	CGIT_CONFIG="$PWD/bigrc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.second &&+	cgit_rc bigrc "url=bigpage/tree/big.txt" >big.second && 	strip_headers <big.first >big.first.body && 	strip_headers <big.second >big.second.body && 	test_cmp big.first.body big.second.body@@ -87,7 +87,7 @@ test_expect_success 'the first request fills the slot and the second replays it'  test_expect_success 'the cached body matches one generated with the cache off' ' 	sed -e "s/^cache-size=64$/cache-size=0/" bigrc >bignocache &&-	CGIT_CONFIG="$PWD/bignocache" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.nocache &&+	cgit_rc bignocache "url=bigpage/tree/big.txt" >big.nocache && 	strip_headers <big.nocache >big.nocache.body && 	test_cmp big.nocache.body big.second.body '@@ -104,14 +104,14 @@ test_expect_success 'an over-long cache key leaves no slot behind' ' 	rm -rf cache3 && mkdir cache3 && 	sed -e "s|^cache-root=.*|cache-root=$PWD/cache3|" bigrc >bigkeyrc && 	long=$(awk "BEGIN{s=\"\";for(i=0;i<6000;i++)s=s \"k\"; print s}") &&-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/&q=$long" cgit >key.out 2>/dev/null &&+	cgit_rc bigkeyrc "url=bigpage/&q=$long" >key.out 2>/dev/null && 	grep "</html>" key.out && 	test_dir_is_empty cache3 '  test_expect_success 'an ordinary key still fills a slot' ' 	rm -rf cache3 && mkdir cache3 &&-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&+	cgit_rc bigkeyrc "url=bigpage/" >/dev/null && 	ls cache3 >key.slots && 	test_line_count = 1 key.slots '@@ -137,7 +137,7 @@ test_expect_success 'set up a repo missing a parent object' ' '  test_expect_success 'an error after output began ends the page with it and caches nothing' '-	CGIT_CONFIG="$PWD/brokenrc" QUERY_STRING="url=broken/commit/&id=$tip" cgit >broken.out &&+	cgit_rc brokenrc "url=broken/commit/&id=$tip" >broken.out && 	grep "Not a commit" broken.out && 	test $(grep -c "^Status:" broken.out) = 1 && 	test_dir_is_empty cache4@@ -159,9 +159,9 @@ test_expect_success 'an error page leaves no slot behind' ' # a slot would only double the disk they take. test_expect_success 'a clone file leaves no slot behind' ' 	rm -rf cache3 && mkdir cache3 &&-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/info/refs" cgit >clone.out &&+	cgit_rc bigkeyrc "url=bigpage/info/refs" >clone.out && 	grep "refs/heads/master" clone.out &&-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/objects/info/packs" cgit >packs.out &&+	cgit_rc bigkeyrc "url=bigpage/objects/info/packs" >packs.out && 	grep "^Status: 200" packs.out && 	test_dir_is_empty cache3 '@@ -176,21 +176,21 @@ test_expect_success 'a response over cache-max-slot-size is served but not kept' 		echo "cache-max-slot-size=32" && 		cat bigkeyrc 	} >slotsizerc &&-	CGIT_CONFIG="$PWD/slotsizerc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.unkept &&+	cgit_rc slotsizerc "url=bigpage/tree/big.txt" >big.unkept && 	tail -c 200 big.unkept | grep "</html>" && 	test_dir_is_empty cache3 &&-	CGIT_CONFIG="$PWD/slotsizerc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&+	cgit_rc slotsizerc "url=bigpage/" >/dev/null && 	ls cache3 >kept.slots && 	test_line_count = 1 kept.slots '  test_expect_success 'an expired slot is dropped when its refill is too large' ' 	rm -rf cache3 && mkdir cache3 &&-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >/dev/null &&+	cgit_rc bigkeyrc "url=bigpage/tree/big.txt" >/dev/null && 	ls cache3 >filled.slots && 	test_line_count = 1 filled.slots && 	touch -t 200001010000 cache3/* &&-	CGIT_CONFIG="$PWD/slotsizerc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.refill &&+	cgit_rc slotsizerc "url=bigpage/tree/big.txt" >big.refill && 	tail -c 200 big.refill | grep "</html>" && 	test_dir_is_empty cache3 '@@ -204,11 +204,11 @@ test_expect_success 'pages following a branch take the dynamic ttl' ' 		echo "cache-dynamic-ttl=0" && 		cat bigkeyrc 	} >dynamicrc &&-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/log/" cgit >/dev/null &&-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/log/&h=master" cgit >/dev/null &&+	cgit_rc dynamicrc "url=bigpage/log/" >/dev/null &&+	cgit_rc dynamicrc "url=bigpage/log/&h=master" >/dev/null && 	test_dir_is_empty cache3 &&-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/summary/" cgit >/dev/null &&+	cgit_rc dynamicrc "url=bigpage/" >/dev/null &&+	cgit_rc dynamicrc "url=bigpage/summary/" >/dev/null && 	ls cache3 >summary.slots && 	test_line_count = 2 summary.slots '@@ -222,7 +222,7 @@ test_expect_success 'a failed final write still delivers the page' ' 	( 		trap "" XFSZ && 		ulimit -f 2 &&-		CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit 2>flush.err+		cgit_rc bigkeyrc "url=bigpage/" 2>flush.err 	) | cat >flush.out && 	grep "^Status: 200" flush.out && 	grep "</html>" flush.out &&@@ -234,13 +234,13 @@ test_expect_success 'a failed final write still delivers the page' ' overlap_requests() { 	n=0 	rm -f filter-running-	CGIT_CONFIG="$PWD/lockrc" QUERY_STRING="url=bigpage/about/" cgit >first.out 2>first.err &+	cgit_rc lockrc "url=bigpage/about/" >first.out 2>first.err & 	while ! test -f filter-running && test $n -lt 10 	do 		sleep 1 		n=$((n + 1)) 	done-	CGIT_CONFIG="$PWD/lockrc" QUERY_STRING="url=bigpage/log/" cgit >/dev/null 2>second.err+	cgit_rc lockrc "url=bigpage/log/" >/dev/null 2>second.err 	wait } @@ -301,13 +301,13 @@ test_expect_success PERL 'a filter holds the lock file only as its stdout' ' # to the copy shows that it is what was served. test_expect_success SANITY 'a refresh that cannot lock serves the expired slot and says why' ' 	rm -rf cache3 && mkdir cache3 &&-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&+	cgit_rc bigkeyrc "url=bigpage/" >/dev/null && 	slot=$(ls cache3) && 	echo "the expired copy" >>"cache3/$slot" && 	touch -t 200001010000 "cache3/$slot" && 	test_when_finished "chmod u+w cache3" && 	chmod a-w cache3 &&-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit >stale.out 2>stale.err &&+	cgit_rc bigkeyrc "url=bigpage/" >stale.out 2>stale.err && 	grep "the expired copy" stale.out && 	grep "Unable to open .*\.lock: Permission denied" stale.err '@@ -320,7 +320,7 @@ test_expect_success 'a slot lock that cannot take its key is let go' ' 	( 		trap "" XFSZ && 		ulimit -f 0 &&-		CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit 2>&1+		cgit_rc bigkeyrc "url=bigpage/" 2>&1 	) | cat >nokey.out && 	grep "</html>" nokey.out && 	grep "Unable to write .*\.lock" nokey.out &&@@ -341,7 +341,7 @@ test_expect_success 'set up a cached scan of two repositories' ' 		echo "scan-path=$PWD/scanned" 	} >scanrc && 	rm -rf cache5 && mkdir cache5 &&-	CGIT_CONFIG="$PWD/scanrc" QUERY_STRING="url=" cgit >/dev/null &&+	cgit_rc scanrc "url=" >/dev/null && 	scanned_rc=$(ls cache5) && 	test_path_is_file "cache5/$scanned_rc" '
diff --git a/tests/t0003-cache.sh b/tests/t0003-cache.sh
index 17816c3..ec88046 100755
--- a/tests/t0003-cache.sh
+++ b/tests/t0003-cache.sh
@@ -77,9 +77,9 @@ test_expect_success 'set up a repo with a page larger than the output buffer' '
 '
 
 test_expect_success 'the first request fills the slot and the second replays it' '
-	CGIT_CONFIG="$PWD/bigrc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.first &&
+	cgit_rc bigrc "url=bigpage/tree/big.txt" >big.first &&
 	test $(wc -c <big.first) -gt 65536 &&
-	CGIT_CONFIG="$PWD/bigrc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.second &&
+	cgit_rc bigrc "url=bigpage/tree/big.txt" >big.second &&
 	strip_headers <big.first >big.first.body &&
 	strip_headers <big.second >big.second.body &&
 	test_cmp big.first.body big.second.body
@@ -87,7 +87,7 @@ test_expect_success 'the first request fills the slot and the second replays it'
 
 test_expect_success 'the cached body matches one generated with the cache off' '
 	sed -e "s/^cache-size=64$/cache-size=0/" bigrc >bignocache &&
-	CGIT_CONFIG="$PWD/bignocache" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.nocache &&
+	cgit_rc bignocache "url=bigpage/tree/big.txt" >big.nocache &&
 	strip_headers <big.nocache >big.nocache.body &&
 	test_cmp big.nocache.body big.second.body
 '
@@ -104,14 +104,14 @@ test_expect_success 'an over-long cache key leaves no slot behind' '
 	rm -rf cache3 && mkdir cache3 &&
 	sed -e "s|^cache-root=.*|cache-root=$PWD/cache3|" bigrc >bigkeyrc &&
 	long=$(awk "BEGIN{s=\"\";for(i=0;i<6000;i++)s=s \"k\"; print s}") &&
-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/&q=$long" cgit >key.out 2>/dev/null &&
+	cgit_rc bigkeyrc "url=bigpage/&q=$long" >key.out 2>/dev/null &&
 	grep "</html>" key.out &&
 	test_dir_is_empty cache3
 '
 
 test_expect_success 'an ordinary key still fills a slot' '
 	rm -rf cache3 && mkdir cache3 &&
-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&
+	cgit_rc bigkeyrc "url=bigpage/" >/dev/null &&
 	ls cache3 >key.slots &&
 	test_line_count = 1 key.slots
 '
@@ -137,7 +137,7 @@ test_expect_success 'set up a repo missing a parent object' '
 '
 
 test_expect_success 'an error after output began ends the page with it and caches nothing' '
-	CGIT_CONFIG="$PWD/brokenrc" QUERY_STRING="url=broken/commit/&id=$tip" cgit >broken.out &&
+	cgit_rc brokenrc "url=broken/commit/&id=$tip" >broken.out &&
 	grep "Not a commit" broken.out &&
 	test $(grep -c "^Status:" broken.out) = 1 &&
 	test_dir_is_empty cache4
@@ -159,9 +159,9 @@ test_expect_success 'an error page leaves no slot behind' '
 # a slot would only double the disk they take.
 test_expect_success 'a clone file leaves no slot behind' '
 	rm -rf cache3 && mkdir cache3 &&
-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/info/refs" cgit >clone.out &&
+	cgit_rc bigkeyrc "url=bigpage/info/refs" >clone.out &&
 	grep "refs/heads/master" clone.out &&
-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/objects/info/packs" cgit >packs.out &&
+	cgit_rc bigkeyrc "url=bigpage/objects/info/packs" >packs.out &&
 	grep "^Status: 200" packs.out &&
 	test_dir_is_empty cache3
 '
@@ -176,21 +176,21 @@ test_expect_success 'a response over cache-max-slot-size is served but not kept'
 		echo "cache-max-slot-size=32" &&
 		cat bigkeyrc
 	} >slotsizerc &&
-	CGIT_CONFIG="$PWD/slotsizerc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.unkept &&
+	cgit_rc slotsizerc "url=bigpage/tree/big.txt" >big.unkept &&
 	tail -c 200 big.unkept | grep "</html>" &&
 	test_dir_is_empty cache3 &&
-	CGIT_CONFIG="$PWD/slotsizerc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&
+	cgit_rc slotsizerc "url=bigpage/" >/dev/null &&
 	ls cache3 >kept.slots &&
 	test_line_count = 1 kept.slots
 '
 
 test_expect_success 'an expired slot is dropped when its refill is too large' '
 	rm -rf cache3 && mkdir cache3 &&
-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >/dev/null &&
+	cgit_rc bigkeyrc "url=bigpage/tree/big.txt" >/dev/null &&
 	ls cache3 >filled.slots &&
 	test_line_count = 1 filled.slots &&
 	touch -t 200001010000 cache3/* &&
-	CGIT_CONFIG="$PWD/slotsizerc" QUERY_STRING="url=bigpage/tree/big.txt" cgit >big.refill &&
+	cgit_rc slotsizerc "url=bigpage/tree/big.txt" >big.refill &&
 	tail -c 200 big.refill | grep "</html>" &&
 	test_dir_is_empty cache3
 '
@@ -204,11 +204,11 @@ test_expect_success 'pages following a branch take the dynamic ttl' '
 		echo "cache-dynamic-ttl=0" &&
 		cat bigkeyrc
 	} >dynamicrc &&
-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/log/" cgit >/dev/null &&
-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/log/&h=master" cgit >/dev/null &&
+	cgit_rc dynamicrc "url=bigpage/log/" >/dev/null &&
+	cgit_rc dynamicrc "url=bigpage/log/&h=master" >/dev/null &&
 	test_dir_is_empty cache3 &&
-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&
-	CGIT_CONFIG="$PWD/dynamicrc" QUERY_STRING="url=bigpage/summary/" cgit >/dev/null &&
+	cgit_rc dynamicrc "url=bigpage/" >/dev/null &&
+	cgit_rc dynamicrc "url=bigpage/summary/" >/dev/null &&
 	ls cache3 >summary.slots &&
 	test_line_count = 2 summary.slots
 '
@@ -222,7 +222,7 @@ test_expect_success 'a failed final write still delivers the page' '
 	(
 		trap "" XFSZ &&
 		ulimit -f 2 &&
-		CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit 2>flush.err
+		cgit_rc bigkeyrc "url=bigpage/" 2>flush.err
 	) | cat >flush.out &&
 	grep "^Status: 200" flush.out &&
 	grep "</html>" flush.out &&
@@ -234,13 +234,13 @@ test_expect_success 'a failed final write still delivers the page' '
 overlap_requests() {
 	n=0
 	rm -f filter-running
-	CGIT_CONFIG="$PWD/lockrc" QUERY_STRING="url=bigpage/about/" cgit >first.out 2>first.err &
+	cgit_rc lockrc "url=bigpage/about/" >first.out 2>first.err &
 	while ! test -f filter-running && test $n -lt 10
 	do
 		sleep 1
 		n=$((n + 1))
 	done
-	CGIT_CONFIG="$PWD/lockrc" QUERY_STRING="url=bigpage/log/" cgit >/dev/null 2>second.err
+	cgit_rc lockrc "url=bigpage/log/" >/dev/null 2>second.err
 	wait
 }
 
@@ -301,13 +301,13 @@ test_expect_success PERL 'a filter holds the lock file only as its stdout' '
 # to the copy shows that it is what was served.
 test_expect_success SANITY 'a refresh that cannot lock serves the expired slot and says why' '
 	rm -rf cache3 && mkdir cache3 &&
-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit >/dev/null &&
+	cgit_rc bigkeyrc "url=bigpage/" >/dev/null &&
 	slot=$(ls cache3) &&
 	echo "the expired copy" >>"cache3/$slot" &&
 	touch -t 200001010000 "cache3/$slot" &&
 	test_when_finished "chmod u+w cache3" &&
 	chmod a-w cache3 &&
-	CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit >stale.out 2>stale.err &&
+	cgit_rc bigkeyrc "url=bigpage/" >stale.out 2>stale.err &&
 	grep "the expired copy" stale.out &&
 	grep "Unable to open .*\.lock: Permission denied" stale.err
 '
@@ -320,7 +320,7 @@ test_expect_success 'a slot lock that cannot take its key is let go' '
 	(
 		trap "" XFSZ &&
 		ulimit -f 0 &&
-		CGIT_CONFIG="$PWD/bigkeyrc" QUERY_STRING="url=bigpage/" cgit 2>&1
+		cgit_rc bigkeyrc "url=bigpage/" 2>&1
 	) | cat >nokey.out &&
 	grep "</html>" nokey.out &&
 	grep "Unable to write .*\.lock" nokey.out &&
@@ -341,7 +341,7 @@ test_expect_success 'set up a cached scan of two repositories' '
 		echo "scan-path=$PWD/scanned"
 	} >scanrc &&
 	rm -rf cache5 && mkdir cache5 &&
-	CGIT_CONFIG="$PWD/scanrc" QUERY_STRING="url=" cgit >/dev/null &&
+	cgit_rc scanrc "url=" >/dev/null &&
 	scanned_rc=$(ls cache5) &&
 	test_path_is_file "cache5/$scanned_rc"
 '