testing: put C++ tests first, add --ansi

BNFC · Mar 3, 2022 · cc2c700 · cc2c700
1 parent afccbee
commit cc2c700
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/testing/Main.hs b/testing/Main.hs
@@ -48,7 +48,7 @@ runAllTests = do
     succeedLBNFTests :
     failLBNFTests :
     -- ParameterizedTests.layoutTest :
-    ParameterizedTests.current :  -- Uncomment for prioritized test case.
+    -- ParameterizedTests.current :  -- Uncomment for prioritized test case.
     -- RegressionTests.current :
     ParameterizedTests.all :
     RegressionTests.all    :

diff --git a/testing/src/ParameterizedTests.hs b/testing/src/ParameterizedTests.hs
@@ -343,6 +343,18 @@ haskellRunTestProg _lang args = do
 parameters :: [TestParameters]
 parameters = concat
   [ []
+    -- C++ (extras)
+  , [ cBase { tpName = "C++ (with line numbers)"
+            , tpBnfcOptions = ["--cpp", "-l"] }
+    , cBase { tpName = "C++ (with namespace)"
+            , tpBnfcOptions = ["--cpp", "-p foobar"] }
+    ]
+    -- C++ (basic)
+  , [ cBase { tpName = "C++ (no STL)"
+            , tpBnfcOptions = ["--cpp-nostl"] }
+    , cBase { tpName = "C++ (ANSI)"
+            , tpBnfcOptions = ["--cpp", "--ansi"] }
+    ]
     -- OCaml/Menhir
   , [ ocaml { tpName = "OCaml/Menhir"
             , tpBnfcOptions = ["--ocaml", "--menhir"] }
@@ -351,12 +363,6 @@ parameters = concat
   , [ ocaml ]
     -- Functor (Haskell & Agda)
   , [ haskellAgdaFunctorParameters]
-    -- C++ (extras)
-  , [ cBase { tpName = "C++ (with line numbers)"
-            , tpBnfcOptions = ["--cpp", "-l"] }
-    , cBase { tpName = "C++ (with namespace)"
-            , tpBnfcOptions = ["--cpp", "-p foobar"] }
-    ]
     -- C
   , [ TP { tpName = "C"
          , tpBnfcOptions = ["--c"]
@@ -380,12 +386,6 @@ parameters = concat
             , tpBnfcOptions = ["--c", "--line-numbers"] }
 
     ]
-    -- C++ (basic)
-  , [ cBase { tpName = "C++ (no STL)"
-            , tpBnfcOptions = ["--cpp-nostl"] }
-    , cBase { tpName = "C++"
-            , tpBnfcOptions = ["--cpp"] }
-    ]
     -- Agda
   , [ haskellAgdaParameters ]
     -- Java/ANTLR