test opencl-find-deal; skip the test run in github actions ubuntu runner

shlomif · Jan 4, 2025 · 955ce74 · 955ce74
1 parent 6e94545
commit 955ce74
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 49 deletions.
diff --git a/fc-solve/scripts/multi_config_tests.pl b/fc-solve/scripts/multi_config_tests.pl
@@ -769,63 +769,68 @@ sub enable_website_build_for_now
     }
 );
 
-_chdir_run(
-    '../',
-    sub {
-        my $base_path      = path("B-opencl")->absolute();
-        my $board_gen_path = $base_path->child("board_gen")->absolute();
-        my $inst_path      = path("INST-opencl")->absolute();
-        $board_gen_path->mkdir();
-
-        local $ENV{'CC'}      = 'clang';
-        local $ENV{'REBUILD'} = '1';
-        local $ENV{PATH}      = $ENV{PATH} . ":${inst_path}/bin";
-
-        _chdir_run(
-            $base_path,
-            sub {
-                warn qx#pwd#;
-                run_cmd(
-                    "OpenCL tests setup",
-                    {
-                        cmd => [
-                            "bash",
-                            "-c",
-"../scripts/Tatzer --prefix $inst_path && make install",
-                        ]
-                    }
-                );
-            }
-        );
-
-        _chdir_run(
-            $board_gen_path,
-            sub {
-                warn qx#pwd#;
-                run_cmd(
-                    "OpenCL tests",
-                    {
-                        cmd =>
-                            [ qw(prove), glob('../../scripts/opencl-test.t') ]
-                    }
-                );
-            }
-        );
-    }
-);
-
 use Getopt::Long qw/ GetOptions /;
 
 my $include_filter;
 my $only_check_ready;
 my $skip_dzil_tests;
+my $skip_opencl_tests;
 
 GetOptions(
-    "include=s"         => \$include_filter,
-    "only-check-ready!" => \$only_check_ready,
-    "skip-dzil-tests!"  => \$$skip_dzil_tests,
+    "include=s"          => \$include_filter,
+    "only-check-ready!"  => \$only_check_ready,
+    "skip-dzil-tests!"   => \$skip_dzil_tests,
+    "skip-opencl-tests!" => \$skip_opencl_tests,
 ) or die $!;
 
+if ( not $skip_opencl_tests )
+{
+    _chdir_run(
+        '../',
+        sub {
+            my $base_path      = path("B-opencl")->absolute();
+            my $board_gen_path = $base_path->child("board_gen")->absolute();
+            my $inst_path      = path("INST-opencl")->absolute();
+            $board_gen_path->mkdir();
+
+            local $ENV{'CC'}      = 'clang';
+            local $ENV{'REBUILD'} = '1';
+            local $ENV{PATH}      = $ENV{PATH} . ":${inst_path}/bin";
+
+            _chdir_run(
+                $base_path,
+                sub {
+                    warn qx#pwd#;
+                    run_cmd(
+                        "OpenCL tests setup",
+                        {
+                            cmd => [
+                                "bash",
+                                "-c",
+"../scripts/Tatzer --prefix $inst_path && make install",
+                            ]
+                        }
+                    );
+                }
+            );
+
+            _chdir_run(
+                $board_gen_path,
+                sub {
+                    warn qx#pwd#;
+                    run_cmd(
+                        "OpenCL tests",
+                        {
+                            cmd => [
+                                qw(prove), glob('../../scripts/opencl-test.t')
+                            ]
+                        }
+                    );
+                }
+            );
+        }
+    );
+}
 if ( not $skip_dzil_tests )
 {
     foreach my $dir_path_name (

diff --git a/fc-solve/scripts/run-ci-tests.bash b/fc-solve/scripts/run-ci-tests.bash
@@ -46,4 +46,4 @@ avoid_valgrind_issues_on_travis()
     export FC_SOLVE__MULT_CONFIG_TESTS__GCC_ARCH="x64"
 }
 avoid_valgrind_issues_on_travis
-perl ../scripts/multi_config_tests.pl 2>&1 | zenfilter --count-step=500 --last=500 --filter='^Running:\s*\{' --suppress-last-on="All tests successful\\.\\n*\\Z"
+perl ../scripts/multi_config_tests.pl --skip-opencl-tests 2>&1 | zenfilter --count-step=500 --last=500 --filter='^Running:\s*\{' --suppress-last-on="All tests successful\\.\\n*\\Z"