Merge pull request #6256 from michaellilltokiwa/tests--remove-distinction-run_tests-vs-run_test_parallel

tests: remove distinction run_tests vs run_test_parallel

Author: michaellilltokiwa

.github/workflows/apple.yml

@@ -81,4 +81,4 @@ jobs:
         run: make -j$(sysctl -n hw.ncpu) no-java
 
       - name: run tests
-        run: make run_tests_parallel
+        run: make run_tests

.github/workflows/linux.yml

@@ -71,4 +71,4 @@ jobs:
         run: make -j$(nproc) no-java
 
       - name: run tests
-        run: make run_tests_parallel
+        run: make run_tests

.github/workflows/windows.yml

@@ -103,4 +103,4 @@ jobs:
           export JAVA_HOME="/c/Program Files/OpenJDK/jdk-25"
           export PATH="/ucrt64/bin/:$JAVA_HOME/bin:$JAVA_HOME/bin/server:$PATH"
           export FUZION_CLANG_INSTALLED_DIR="D:/a/_temp/msys64/ucrt64/bin"
-          make run_tests_parallel
+          make run_tests

Makefile

@@ -577,61 +577,28 @@ run_tests: run_tests_fuir run_tests_jvm run_tests_c run_tests_int run_tests_effe
 .PHONY .SILENT: run_tests_effect
 run_tests_effect: $(FZ) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
 	printf "testing effects: "
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) effect 1
+	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) effect
 
 # phony target to run Fuzion tests using interpreter and report number of failures
 .PHONY .SILENT: run_tests_int
 run_tests_int: $(FZ_INT) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
 	printf "testing interpreter: "
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) int 1
+	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) int
 
 # phony target to run Fuzion tests using c backend and report number of failures
 .PHONY .SILENT: run_tests_c
 run_tests_c: $(FZ_C) $(FZ_MODULES) $(MOD_JAVA_BASE) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
 	printf "testing C backend: "; \
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) c 1
+	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) c
 
 # phony target to run Fuzion tests using jvm backend and report number of failures
 .PHONY .SILENT: run_tests_jvm
 run_tests_jvm: $(FZ_JVM) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
 	printf "testing JVM backend: "; \
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) jvm 1
+	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) jvm
 
 .PHONY .SILENT: run_tests_fuir
 run_tests_fuir: $(FZ_JVM) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
-	printf "testing FUIR backend: "; \
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) fuir 1
-
-# phony target to run Fuzion tests and report number of failures
-.PHONY: run_tests_parallel
-run_tests_parallel: run_tests_fuir_parallel run_tests_jvm_parallel run_tests_c_parallel run_tests_int_parallel run_tests_effect_parallel run_tests_jar
-
-# phony target to run Fuzion test effects and report number of failures
-.PHONY .SILENT: run_tests_effect_parallel
-run_tests_effect_parallel: $(FZ) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
-	printf "testing effects: "
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) effect
-
-# phony target to run Fuzion tests using interpreter and report number of failures
-.PHONY .SILENT: run_tests_int_parallel
-run_tests_int_parallel: $(FZ_INT) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
-	printf "testing interpreter: "
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) int
-
-# phony target to run Fuzion tests using c backend and report number of failures
-.PHONY .SILENT: run_tests_c_parallel
-run_tests_c_parallel: $(FZ_C) $(FZ_MODULES) $(MOD_JAVA_BASE) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
-	printf "testing C backend: "; \
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) c
-
-# phony target to run Fuzion tests using jvm backend and report number of failures
-.PHONY .SILENT: run_tests_jvm_parallel
-run_tests_jvm_parallel: $(FZ_JVM) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
-	printf "testing JVM backend: "; \
-	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) jvm
-
-.PHONY .SILENT: run_tests_fuir_parallel
-run_tests_fuir_parallel: $(FZ_JVM) $(FZ_MODULES) $(MOD_JAVA_BASE) $(MOD_FZ_CMD) $(BUILD_DIR)/tests $(BUILD_DIR)/bin/run_tests
 	printf "testing FUIR backend: "; \
 	$(BUILD_DIR)/bin/run_tests $(BUILD_DIR) fuir
 

bin/run_tests.fz

@@ -196,7 +196,7 @@ main =>
   # first, try third arg then try a few executables, if everything fails use default value
   tc :=
     fuzion.runtime.contract_fault
-      .try ()->(envir.args.nth 3).val.trim.parse_i32.val
+      .try ()->(envir.vars["FUZION_RUN_TESTS_PARALLELISM"]).val.trim.parse_i32.val
       .or_try _->(!!"nproc --all").out.trim.parse_i32.val
       .or_try _->(!!"getconf _NPROCESSORS_ONLN").out.trim.parse_i32.val
       .or_try _->(!!"sysctl -n hw.ncpu").out.trim.parse_i32.val