diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 31b8afbd..e2319c71 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -9,7 +9,7 @@ on: - '**.md' env: - TORTURE_FLAGS: "* --gen_crash_dump" + TORTURE_FLAGS: "--gen_crash_dump" jobs: build-ubuntu-24-04: @@ -97,7 +97,7 @@ jobs: - name: Run shell: bash run: | - CC="${{ matrix.compiler }}" ./run.sh clang "${{ matrix.mode }}" -- $TORTURE_FLAGS + CC="${{ matrix.compiler }}" ./run.sh clang "${{ matrix.mode }}" -- \* $TORTURE_FLAGS - name: Upload Artifacts if: failure() uses: actions/upload-artifact@v7 @@ -129,7 +129,7 @@ jobs: 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" 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 if: failure() uses: actions/upload-artifact@v7 diff --git a/src/torture/torture.c b/src/torture/torture.c index c514ea9c..f7162932 100644 --- a/src/torture/torture.c +++ b/src/torture/torture.c @@ -1449,5 +1449,6 @@ t_entry_point(CmdLine *cmdline) } scratch_end(scratch); - // TODO: return exit_code; + exit(exit_code); } + diff --git a/src/torture/torture_dbg.c b/src/torture/torture_dbg.c index 7dfb7036..9c23b219 100644 --- a/src/torture/torture_dbg.c +++ b/src/torture/torture_dbg.c @@ -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 - 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; goto exit; }