Merge remote-tracking branch 'origin/v9-minor'

Author: scip-ci

tests/include/scip_test.c

@@ -24,6 +24,7 @@
 
 #include "scip/nodesel_dfs.h"
 #include "scip/cons_integral.h"
+#include <locale.h>
 
 /** execution method of presolver */
 static
@@ -165,3 +166,13 @@ void TESTsetTestfilename(
    else
       (void)SCIPsnprintf(filename, SCIP_MAXSTRLEN, testfile);
 }
+
+/* ensure we run with C locale */
+#ifdef __GNUC__
+__attribute__((constructor))
+static
+void TESTsetlocale(void)
+{
+   setlocale(LC_ALL, "C");
+}
+#endif

tests/include/scip_test.h

@@ -22,7 +22,6 @@ void TESTsetTestfilename(
  * be available every test.
  * */
 #include "scip_test.c"
-#include "locale.h"
 
 #ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wredundant-decls"
@@ -49,17 +48,3 @@ void TESTsetTestfilename(
                           }                                                                                   \
                        }                                                                                      \
                        while( FALSE )
-
-CR_API int main(int argc, char *argv[]) {
-    struct criterion_test_set *tests = criterion_initialize();
-
-    int result = 0;
-    if (criterion_handle_args(argc, argv, true))
-    {
-       setlocale(LC_ALL, "C");
-       result = !criterion_run_all_tests(tests);
-    }
-
-    criterion_finalize(tests);
-    return result;
-}