[ fix ] various escaping things

gallais · gallais · commit 2f9a5a3f8232 · 2025-11-20T23:54:34.000Z
diff --git a/tests/Makefile b/tests/Makefile
@@ -15,3 +15,8 @@ test: ./runtests
 
 retest: ./runtests
 	./runtests "$(AGDA)" $(INTERACTIVE) --timing --failure-file failures --only-file failures --only $(only)
+
+clean:
+	rm -rf runtests
+	rm -rf _config/_build
+	rm -rf _config/dist-newstyle
diff --git a/tests/_config/config.sh b/tests/_config/config.sh
@@ -15,7 +15,7 @@ set -eu
 goldenTest () {
 
   AGDA=$1
-  TEST_NAME=$2
+  TEST_NAME="stdlib-test-$2"
 
   # Remember whether the script has an input -- ugh
   if [ -f input ]; then
@@ -43,7 +43,7 @@ goldenTest () {
   ln -sf "$CABAL_BUILD_DIR" dist-newstyle
 
   # Compile the Agda module and build the generated code
-  "$AGDA" --library-file=../../_config/libraries --compile-dir=_build -c --ghc-dont-call-ghc Main.agda > logs/agda-build
+  $AGDA --library-file=../../_config/libraries --compile-dir=_build -c --ghc-dont-call-ghc Main.agda > logs/agda-build
   cabal build "$TEST_NAME" --with-compiler "$GHC_EXEC" > logs/cabal-build
 
   # Run the test
diff --git a/tests/data/appending/TakeWhile.agda b/tests/data/appending/TakeWhile.agda
@@ -13,7 +13,7 @@ import Data.Nat
 open import Relation.Unary
 open import Relation.Binary.PropositionalEquality as P using (_≡_)
 open import Relation.Nullary
-open import Relation.Nullary.Product
+open import Relation.Nullary.Decidable
 
 -- Original bug reported in #1765 by James Wood
 _ : Appending (3 ∷ []) (2 ∷ []) (3 ∷ 2 ∷ [])
diff --git a/tests/data/appending/run b/tests/data/appending/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "appending"
+goldenTest "$1" "appending"
diff --git a/tests/data/colist/run b/tests/data/colist/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "colist"
+goldenTest "$1" "colist"
diff --git a/tests/data/list/run b/tests/data/list/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "list"
+goldenTest "$1" "list"
diff --git a/tests/data/rational-unnormalised/run b/tests/data/rational-unnormalised/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "rational-unnormalised"
+goldenTest "$1" "rational-unnormalised"
diff --git a/tests/data/rational/run b/tests/data/rational/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "rational"
+goldenTest "$1" "rational"
diff --git a/tests/data/trie/run b/tests/data/trie/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "trie"
+goldenTest "$1" "trie"
diff --git a/tests/monad/counting/run b/tests/monad/counting/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "counting"
+goldenTest "$1" "counting"
diff --git a/tests/monad/fibonacci/run b/tests/monad/fibonacci/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "fibonacci"
+goldenTest "$1" "fibonacci"
diff --git a/tests/monad/pythagorean/run b/tests/monad/pythagorean/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "pythagorean"
+goldenTest "$1" "pythagorean"
diff --git a/tests/monad/tcm/run b/tests/monad/tcm/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "tcm"
+goldenTest "$1" "tcm"
diff --git a/tests/reflection/assumption/run b/tests/reflection/assumption/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "assumption"
+goldenTest "$1" "assumption"
diff --git a/tests/show/num/run b/tests/show/num/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "num"
+goldenTest "$1" "num"
diff --git a/tests/show/reflection/run b/tests/show/reflection/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "reflection"
+goldenTest "$1" "reflection"
diff --git a/tests/show/tree/run b/tests/show/tree/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "tree"
+goldenTest "$1" "tree"
diff --git a/tests/system/ansi/run b/tests/system/ansi/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "ansi"
+goldenTest "$1" "ansi"
diff --git a/tests/system/directory/run b/tests/system/directory/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "directory"
+goldenTest "$1" "directory"
diff --git a/tests/system/environment/run b/tests/system/environment/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "environment"
+goldenTest "$1" "environment"
diff --git a/tests/text/pretty/run b/tests/text/pretty/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "pretty"
+goldenTest "$1" "pretty"
diff --git a/tests/text/printf/run b/tests/text/printf/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "printf"
+goldenTest "$1" "printf"
diff --git a/tests/text/regex/run b/tests/text/regex/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "regex"
+goldenTest "$1" "regex"
diff --git a/tests/text/tabular/run b/tests/text/tabular/run
@@ -1,2 +1,2 @@
 . ../../_config/config.sh
-goldenTest $1 "tabular"
+goldenTest "$1" "tabular"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`. ../../_config/config.sh`
`2`		`-goldenTest $1 "appending"`
	`2`	`+goldenTest "$1" "appending"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`. ../../_config/config.sh`
`2`		`-goldenTest $1 "colist"`
	`2`	`+goldenTest "$1" "colist"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`. ../../_config/config.sh`
`2`		`-goldenTest $1 "list"`
	`2`	`+goldenTest "$1" "list"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`. ../../_config/config.sh`
`2`		`-goldenTest $1 "rational-unnormalised"`
	`2`	`+goldenTest "$1" "rational-unnormalised"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`. ../../_config/config.sh`
`2`		`-goldenTest $1 "rational"`
	`2`	`+goldenTest "$1" "rational"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`. ../../_config/config.sh`
`2`		`-goldenTest $1 "trie"`
	`2`	`+goldenTest "$1" "trie"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`. ../../_config/config.sh`
`2`		`-goldenTest $1 "counting"`
	`2`	`+goldenTest "$1" "counting"`