Use 'test' in github action

miking-lang · Dec 18, 2024 · 22f6561 · 22f6561
1 parent 1176f5d
commit 22f6561
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1,058 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
           # Install dependencies of owl
           sudo apt-get install -y liblapacke-dev libopenblas-dev
 
-          # Install all opam packages used in make test-all
+          # Install all opam packages used in make test
           opam install -y dune linenoise pyml toml lwt owl ocamlformat.0.24.1
 
       - name: Build Miking
@@ -42,7 +42,7 @@ jobs:
         timeout-minutes: 60
         run: |
           eval $(opam env)
-          make test-all
+          make test
 
   build-and-test-mac-os:
     runs-on: macos-13
@@ -73,7 +73,7 @@ jobs:
           ln -s $(brew --prefix gcc)/lib/gcc/current/libgcc_s.1.1.dylib $(brew --prefix openblas)/lib
           ln -s $(brew --prefix gcc)/lib/gcc/current/libquadmath.0.dylib $(brew --prefix openblas)/lib
 
-          # Install all opam packages used in make test-all
+          # Install all opam packages used in make test
           opam install -y dune linenoise pyml toml lwt owl ocamlformat.0.24.1
 
       - name: Build Miking
@@ -86,4 +86,4 @@ jobs:
         timeout-minutes: 60
         run: |
           eval $(opam env)
-          make test-all
+          make test
diff --git a/misc/test-spec.mc b/misc/test-spec.mc
@@ -1000,7 +1000,7 @@ testMain
 
   , { testColl "ipopt"
     with checkCondition = lam.
-      if eqi 0 (command "ocamlfind query ipoptml &>/dev/null")
+      if eqi 0 (command "ocamlfind query ipoptml >/dev/null 2>&1")
       then ConditionsMet ()
       else ConditionsUnmet ()
     , conditionalInclusions = lam api.
@@ -1013,7 +1013,7 @@ testMain
 
   , { testColl "sundials"
     with checkCondition = lam.
-      if eqi 0 (command "ocamlfind query sundialsml &>/dev/null")
+      if eqi 0 (command "ocamlfind query sundialsml >/dev/null 2>&1")
       then ConditionsMet ()
       else ConditionsUnmet ()
     , conditionalInclusions = lam api.
@@ -1028,7 +1028,7 @@ testMain
 
   , { testColl "lwt"
     with checkCondition = lam.
-      if eqi 0 (command "ocamlfind query lwt &>/dev/null")
+      if eqi 0 (command "ocamlfind query lwt >/dev/null 2>&1")
       then ConditionsMet ()
       else ConditionsUnmet ()
     , conditionalInclusions = lam api.
@@ -1043,7 +1043,7 @@ testMain
 
   , { testColl "owl"
     with checkCondition = lam.
-      if eqi 0 (command "ocamlfind query owl &>/dev/null")
+      if eqi 0 (command "ocamlfind query owl >/dev/null 2>&1")
       then ConditionsMet ()
       else ConditionsUnmet ()
     , conditionalInclusions = lam api.
@@ -1056,7 +1056,7 @@ testMain
 
   , { testColl "toml"
     with checkCondition = lam.
-      if eqi 0 (command "ocamlfind query toml &>/dev/null")
+      if eqi 0 (command "ocamlfind query toml >/dev/null 2>&1")
       then ConditionsMet ()
       else ConditionsUnmet ()
     , conditionalInclusions = lam api.