skip tests without directive, and escape * in ubuntu run

This commit is contained in:
Nikita Smith
2026-06-02 12:11:00 -07:00
committed by Ryan Fleury
parent 3a109a7343
commit a151df283f
3 changed files with 12 additions and 5 deletions
+3 -3
View File
@@ -9,7 +9,7 @@ on:
- '**.md' - '**.md'
env: env:
TORTURE_FLAGS: "* --gen_crash_dump" TORTURE_FLAGS: "--gen_crash_dump"
jobs: jobs:
build-ubuntu-24-04: build-ubuntu-24-04:
@@ -97,7 +97,7 @@ jobs:
- name: Run - name: Run
shell: bash shell: bash
run: | run: |
CC="${{ matrix.compiler }}" ./run.sh clang "${{ matrix.mode }}" -- $TORTURE_FLAGS CC="${{ matrix.compiler }}" ./run.sh clang "${{ matrix.mode }}" -- \* $TORTURE_FLAGS
- name: Upload Artifacts - name: Upload Artifacts
if: failure() if: failure()
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
@@ -129,7 +129,7 @@ jobs:
run: | run: |
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set "VS_INSTALL=%%i" for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set "VS_INSTALL=%%i"
call "%VS_INSTALL%\VC\Auxiliary\Build\vcvarsall.bat" x64 call "%VS_INSTALL%\VC\Auxiliary\Build\vcvarsall.bat" x64
call run.bat ${{ matrix.compiler }} ${{ matrix.mode }} -- %TORTURE_FLAGS% || exit /b 1 call run.bat ${{ matrix.compiler }} ${{ matrix.mode }} -- * %TORTURE_FLAGS% || exit /b 1
- name: Upload Artifacts - name: Upload Artifacts
if: failure() if: failure()
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
+2 -1
View File
@@ -1449,5 +1449,6 @@ t_entry_point(CmdLine *cmdline)
} }
scratch_end(scratch); scratch_end(scratch);
// TODO: return exit_code; exit(exit_code);
} }
+7 -1
View File
@@ -987,8 +987,14 @@ T_RunSig(dbg_script_runner)
} }
} }
// if test does not have any directive -> skip
U64 total_directive_count = 0;
for EachIndex(i, ArrayCount(script.directives[OperatingSystem_CURRENT])) {
total_directive_count += script.directives[OperatingSystem_CURRENT][i].count;
}
// is skip flag set? -> exit // is skip flag set? -> exit
if (g_build_only || script.directives[OperatingSystem_CURRENT][T_DbgScriptDirectiveKind_Skip].count) { if (g_build_only || total_directive_count == 0 || script.directives[OperatingSystem_CURRENT][T_DbgScriptDirectiveKind_Skip].count) {
result_out->status = T_RunStatus_Skip; result_out->status = T_RunStatus_Skip;
goto exit; goto exit;
} }