Disable some tests.

toitlang · Oct 10, 2024 · dcd9c77 · dcd9c77
1 parent fc46a0f
commit dcd9c77
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -266,8 +266,7 @@ jobs:
 
       - name: Test 64-bit debug
         shell: bash
-        # TODO(florian): fix this for Windows.
-        if: env.DO_MORE_TESTS == 'true' && runner.os != 'Windows'
+        if: env.DO_MORE_TESTS == 'true'
         run: |
           make BUILD=build-debug BUILD_TYPE=Debug test
 
@@ -279,8 +278,7 @@ jobs:
 
       - name: Test -O2 with asserts
         shell: bash
-        # TODO(florian): fix this for Windows.
-        if: env.DO_MORE_TESTS == 'true' && runner.os != 'Windows'
+        if: env.DO_MORE_TESTS == 'true'
         run: |
           TOIT_OPTIMIZATION_OVERRIDE=2 TOIT_ASSERT_OVERRIDE=1 make HOST=host-O2 TOOLCHAIN=host test
 

diff --git a/tests/optimizations/CMakeLists.txt b/tests/optimizations/CMakeLists.txt
@@ -17,7 +17,16 @@ file(GLOB TOIT_OPTIMIZATION_TESTS RELATIVE ${TOIT_SDK_SOURCE_DIR} "*-test.toit")
 
 include(fail.cmake)
 
+set(OPTIMIZATIONS_IS_OVERRIDEN)
+if (DEFINED ENV{TOIT_OPTIMIZATION_OVERRIDE})
+  set(OPTIMIZATIONS_IS_OVERRIDEN TRUE)
+endif()
+
 foreach(file ${TOIT_OPTIMIZATION_TESTS})
+  if(OPTIMIZATIONS_IS_OVERRIDEN)
+    # Don't run optimization tests if the optimization level is overriden.
+    continue()
+  endif()
   if("${file}" IN_LIST TOIT_SKIP_TESTS)
     continue()
   endif()

diff --git a/tests/type_propagation/CMakeLists.txt b/tests/type_propagation/CMakeLists.txt
@@ -87,5 +87,7 @@ function(add_tests flags)
   endforeach()
 endfunction()
 
-add_tests("")
-add_tests("-O2")
+if (NOT DEFINED ENV{TOIT_OPTIMIZATION_OVERRIDE} AND NOT DEFINED ENV{TOIT_ASSERT_OVERRIDE})
+  add_tests("")
+  add_tests("-O2")
+endif()