fix test

tek · Sep 2, 2023 · b57632a · b57632a
1 parent 40e8aae
commit b57632a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/test/basic/test.nix b/test/basic/test.nix
@@ -10,7 +10,7 @@
     target='[ "default" "ghc90-root" "ghc92-root" "ghc94-root" "ghc96-root" "min" "root" "static" ]'
     check 'nix eval .#packages.x86_64-linux --apply builtins.attrNames' $target 'Packages are wrong'
 
-    check 'nix develop .#ghc94 -c ghc --version' 'The Glorious Glasgow Haskell Compilation System, version 9.4.5'
+    check 'nix develop .#ghc94 -c ghc --version' 'The Glorious Glasgow Haskell Compilation System, version 9.4.6' 'Version output wrong'
 
     nix build .#ghc92-root
     check 'result/bin/root' 'string' 'Running the main package produced the wrong output'

diff --git a/test/default.nix b/test/default.nix
@@ -113,8 +113,8 @@ in {
   runtest()
   {
     setopt local_options err_return
-    current="$1"
-    test="''${tests[$current]}"
+    local current="$1"
+    local test="''${tests[$current]}"
     if [[ -z $test ]]
     then
       message "Invalid test name: $current"
@@ -142,14 +142,15 @@ in {
 
   failure=0
   failed=()
-  for target in $=targets
+  local current
+  for current in $=targets
   do
-    runtest $target
+    runtest $current
     if [[ $? != 0 ]]
     then
-      echo ">>> Test failed: $target"
-      failure=$(( failure + 1 ))
-      failed+=($target)
+      echo ">>> Test failed: $current"
+      (( failure = failure + 1 ))
+      failed+=($current)
     fi
   done