Update catch from v2.x to v3.x. CC Based on OS

* macos-12 workflow * test macos-latest-large * macos-latest * ubuntu-latest * g++-13 -> g++ * macos-latest with g++ instead g++-13 * macos-latest only * ubuntu-24.04 beta * CC makefile variable * macos-latest * easier testing * Upgrade Catch2 v2.x to 3.x * ubuntu-latest, all tests * c++17 standard * c++14 standard * ubuntu only * macos-latest only * ubuntu-latest * g++ instead of alias * test * clang * g++-13 test * check os in makefile * Add ubuntu-latest * d * d * conditional CC * delete catch files and add java tests
Compiler-CampusMinden · Jul 26, 2024 · 2a9b31b · 2a9b31b
1 parent ed89fc5
commit 2a9b31b
Show file tree

Hide file tree

Showing 31 changed files with 11,840 additions and 290 deletions.
diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml
@@ -9,7 +9,7 @@ jobs:
     name: Testing C-Runtime
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [macos-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -25,18 +25,18 @@ jobs:
         run: make test_clean ; make clean
 
   languagefeatures:
-    name: Testing CBuilder (Java)
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-      - name: Build with Gradle
-        run: ./gradlew test
+      name: Testing CBuilder (Java)
+      strategy:
+          matrix:
+              os: [ubuntu-latest, macos-latest]
+      runs-on: ${{ matrix.os }}
+      steps:
+          - name: Checkout
+            uses: actions/checkout@v4
+          - name: Set up JDK 21
+            uses: actions/setup-java@v4
+            with:
+                java-version: '21'
+                distribution: 'temurin'
+          - name: Build with Gradle
+            run: ./gradlew test
diff --git a/c-runtime/Makefile b/c-runtime/Makefile
@@ -16,7 +16,7 @@ export TESTDIR := $(realpath ./test)
 export INCLUDEDIRTEST := $(realpath ./test/include)
 export SRCDIRTEST := $(realpath ./test/src)
 
-export C_FILES_TEST := $(wildcard ./test/src/test/*.c ./test/src/test/*/*.c* ./src/*.c ./src/*/*.c*)
+export C_FILES_TEST := $(wildcard ./test/src/test/*.c ./test/src/test/*/*.c* ./test/src/*.cpp)
 export C_FILES_TEST := $(filter-out ./src/program.c, $(C_FILES_TEST))
 export C_FILES := $(wildcard ./src/*.c ./src/*/*.c*)
 export C_FILES := $(filter-out ./src/program.c, $(C_FILES))
@@ -104,7 +104,8 @@ lint:
 #https://github.com/catchorg/Catch2/blob/v2.x/include/catch.hpp
 .PHONY: curl_catch
 curl_catch:
-	curl -o $(TESTDIR)/include/catch.hpp https://raw.githubusercontent.com/catchorg/Catch2/v2.x/single_include/catch2/catch.hpp
+	curl -o $(TESTDIR)/include/catch_amalgamated.hpp https://raw.githubusercontent.com/catchorg/Catch2/devel/extras/catch_amalgamated.hpp
+	curl -o $(TESTDIR)/src/catch_amalgamated.cpp https://raw.githubusercontent.com/catchorg/Catch2/devel/extras/catch_amalgamated.cpp
 
 .PHONY: test
 test: curl_catch
@@ -130,11 +131,11 @@ test_run:
 .PHONY: test_target
 test_target: curl_catch
 	d=$$(date +%s)\
-	; 	make -f $(TESTDIR)/Systemtests/makefile test_greater_equal_op \
+	; 	make -f $(TESTDIR)/Systemtests/makefile test_declaration_and_assignment \
 	&& echo "Build took $$(($$(date +%s)-d)) seconds"
 	make run_target
 	make test_clean
 
 .PHONY: run_target
 run_target:
-	./test/Systemtests/ComparisonOps/TestGreaterEqualOp.out
+	./test/Systemtests/DeclarationAndAssignment/TestDeclarationAndAssignment.out
diff --git a/c-runtime/test/Systemtests/ArithmeticOps/TestArithmeticOps.cpp b/c-runtime/test/Systemtests/ArithmeticOps/TestArithmeticOps.cpp
@@ -2,7 +2,7 @@
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "assert.h"
 #include "mpy_aliases.h"
 #include "mpy_obj.h"

diff --git a/c-runtime/test/Systemtests/BuiltInFunctions/TestCastInt.cpp b/c-runtime/test/Systemtests/BuiltInFunctions/TestCastInt.cpp
@@ -2,7 +2,7 @@
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "assert.h"
 #include "mpy_aliases.h"
 #include "mpy_obj.h"

diff --git a/c-runtime/test/Systemtests/BuiltInFunctions/TestCastString.cpp b/c-runtime/test/Systemtests/BuiltInFunctions/TestCastString.cpp
@@ -2,7 +2,7 @@
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "assert.h"
 #include "mpy_aliases.h"
 #include "mpy_obj.h"

diff --git a/c-runtime/test/Systemtests/BuiltInFunctions/TestId.cpp b/c-runtime/test/Systemtests/BuiltInFunctions/TestId.cpp
@@ -5,7 +5,7 @@
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "assert.h"
 #include "mpy_aliases.h"
 #include "mpy_obj.h"

diff --git a/c-runtime/test/Systemtests/BuiltInFunctions/TestPrint.cpp b/c-runtime/test/Systemtests/BuiltInFunctions/TestPrint.cpp
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "assert.h"
 #include "mpy_aliases.h"
 #include "mpy_obj.h"

diff --git a/c-runtime/test/Systemtests/BuiltInFunctions/TestType.cpp b/c-runtime/test/Systemtests/BuiltInFunctions/TestType.cpp
@@ -2,7 +2,7 @@
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "assert.h"
 #include "mpy_aliases.h"
 #include "mpy_obj.h"

diff --git a/c-runtime/test/Systemtests/Classes/TestClassInheritance.cpp b/c-runtime/test/Systemtests/Classes/TestClassInheritance.cpp
@@ -1,37 +1,19 @@
-#define CATCH_CONFIG_RUNNER
+#define CATCH_CONFIG_MAIN
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "test/test_helpers.h"
 #include "test/Classes/TestClassInheritanceHelpers.h"
 
 __MPyObj *A;
 
 __MPyObj *B;
 
-int main( int argc, char* argv[] ) {
-  // global setup...
-  __mpy_builtins_setup();
-
-  int result = 0;
-
-  try{
-    result = Catch::Session().run( argc, argv );
-  }
-  catch (const std::runtime_error& error){
-      printf("");
-  }
-
-   __mpy_builtins_cleanup();
-  // global clean-up... Why is this working ? ....
-
-  return result;
-}
-
 int inheritance(){
     __MPyObj *child;
 
+    __mpy_builtins_setup();
     child = __mpy_obj_init_object();
     __mpy_obj_ref_inc(child);
 
@@ -65,6 +47,8 @@ int inheritance(){
     __mpy_obj_ref_dec(A);
     __mpy_obj_ref_dec(B);
 
+    __mpy_builtins_cleanup();
+
     return 0;
 }
 

diff --git a/c-runtime/test/Systemtests/Classes/TestClassInit.cpp b/c-runtime/test/Systemtests/Classes/TestClassInit.cpp
@@ -1,8 +1,8 @@
-#define CATCH_CONFIG_RUNNER
+#define CATCH_CONFIG_MAIN
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "test/test_helpers.h"
 #include "test/Classes/TestClassInitHelpers.h"
 
@@ -12,28 +12,12 @@ __MPyObj *init_one_param;
 
 __MPyObj *init_multiple_params;
 
-int main( int argc, char* argv[] ) {
-  // global setup...
-  __mpy_builtins_setup();
-
-  int result = 0;
-
-  try{
-    result = Catch::Session().run( argc, argv );
-  }
-  catch (const std::runtime_error& error){
-      printf("");
-  }
-
-   __mpy_builtins_cleanup();
-  // global clean-up... Why is this working ? ....
-
-  return result;
-}
-
 int init_class_no_params(){
     __MPyObj *x;
 
+    __mpy_builtins_setup();
+
+    __mpy_builtins_setup();
     x = __mpy_obj_init_object();
 	__mpy_obj_ref_inc(x);
 
@@ -58,12 +42,15 @@ int init_class_no_params(){
 
 	__mpy_obj_ref_dec(init_no_params);
 
+    __mpy_builtins_cleanup();
+
 	return 0;
 }
 
 int init_class_one_param(){
     __MPyObj *x;
 
+    __mpy_builtins_setup();
     x = __mpy_obj_init_object();
 	__mpy_obj_ref_inc(x);
 
@@ -89,12 +76,15 @@ int init_class_one_param(){
 
 	print_mpyobj(x);
 
+    __mpy_builtins_cleanup();
+
 	return 0;
 }
 
 int init_class_multiple_params(){
     __MPyObj *x;
 
+    __mpy_builtins_setup();
 	x = __mpy_obj_init_object();
 	__mpy_obj_ref_inc(x);
 
@@ -119,6 +109,8 @@ int init_class_multiple_params(){
 
     print_mpyobj(x);
 
+    __mpy_builtins_cleanup();
+
 	return 0;
 }
 

diff --git a/c-runtime/test/Systemtests/Classes/TestClassInitThrows.cpp b/c-runtime/test/Systemtests/Classes/TestClassInitThrows.cpp
@@ -1,8 +1,8 @@
-#define CATCH_CONFIG_RUNNER
+#define CATCH_CONFIG_MAIN
 
 #include <stddef.h>
 
-#include "catch.hpp"
+#include "catch_amalgamated.hpp"
 #include "test/test_helpers.h"
 #include "test/Classes/TestClassInitHelpers.h"
 
@@ -14,28 +14,10 @@ __MPyObj *init_multiple_params;
 
 void exit(int status);
 
-int main( int argc, char* argv[] ) {
-  // global setup...
-  __mpy_builtins_setup();
-
-  int result = 0;
-
-  try{
-    result = Catch::Session().run( argc, argv );
-  }
-  catch (const std::runtime_error& error){
-      printf("");
-  }
-
-   __mpy_builtins_cleanup();
-  // global clean-up... Why is this working ? ....
-
-  return result;
-}
-
 int init_class_no_params_but_one_provided(){
     __MPyObj *x;
 
+    __mpy_builtins_setup();
     x = __mpy_obj_init_object();
 	__mpy_obj_ref_inc(x);
 
@@ -62,12 +44,15 @@ int init_class_no_params_but_one_provided(){
 
 	__mpy_obj_ref_dec(init_no_params);
 
+    __mpy_builtins_cleanup();
+
 	return 0;
 }
 
 int init_class_one_param_but_none_provided(){
     __MPyObj *x;
 
+    __mpy_builtins_setup();
     x = __mpy_obj_init_object();
 	__mpy_obj_ref_inc(x);
 
@@ -93,12 +78,15 @@ int init_class_one_param_but_none_provided(){
 
 	print_mpyobj(x);
 
+    __mpy_builtins_cleanup();
+
 	return 0;
 }
 
 int init_class_multiple_params_but_less_provided(){
     __MPyObj *x;
 
+    __mpy_builtins_setup();
     x = __mpy_obj_init_object();
     __mpy_obj_ref_inc(x);
 
@@ -123,6 +111,8 @@ int init_class_multiple_params_but_less_provided(){
 
     print_mpyobj(x);
 
+    __mpy_builtins_cleanup();
+
     return 0;
 }