diff --git a/.github/actions/compilers/entrypoint.sh b/.github/actions/compilers/entrypoint.sh index df825a356c..cc8e6e4b23 100755 --- a/.github/actions/compilers/entrypoint.sh +++ b/.github/actions/compilers/entrypoint.sh @@ -72,6 +72,7 @@ fi btests='' tests='' +spec_opts='' # Launchable setup_launchable() { @@ -83,8 +84,10 @@ setup_launchable() { local build_name="${github_ref}"_"${GITHUB_PR_HEAD_SHA}" btest_report_path='launchable_bootstraptest.json' test_report_path='launchable_test_all.json' + test_spec_report_path='launchable_test_spec_report' test_all_session_file='launchable_test_all_session.txt' btest_session_file='launchable_btest_session.txt' + test_spec_session_file='launchable_test_spec_session.txt' btests+=--launchable-test-reports="${btest_report_path}" echo "::group::Setup Launchable" launchable record build --name "${build_name}" || true @@ -112,6 +115,19 @@ setup_launchable() { --flavor cppflags="${INPUT_CPPFLAGS}" \ --test-suite test-all \ > "${builddir}"/${test_all_session_file} + mkdir "${builddir}"/"${test_spec_report_path}" + spec_opts+=--launchable-test-reports="${test_spec_report_path}" + launchable record session \ + --build "${build_name}" \ + --flavor test_task=test-spec \ + --flavor workflow=Compilations \ + --flavor with-gcc="${INPUT_WITH_GCC}" \ + --flavor CFLAGS="${INPUT_CFLAGS}" \ + --flavor CXXFLAGS="${INPUT_CXXFLAGS}" \ + --flavor optflags="${INPUT_OPTFLAGS}" \ + --flavor cppflags="${INPUT_CPPFLAGS}" \ + --test-suite test-spec \ + > "${builddir}"/${test_spec_session_file} fi echo "::endgroup::" trap launchable_record_test EXIT @@ -121,6 +137,7 @@ launchable_record_test() { grouped launchable record tests --session "$(cat "${btest_session_file}")" raw "${btest_report_path}" || true if [ "$INPUT_CHECK" = "true" ]; then grouped launchable record tests --session "$(cat "${test_all_session_file}")" raw "${test_report_path}" || true + grouped launchable record tests --session "$(cat "${test_spec_session_file}")" raw "${test_spec_report_path}"/* || true fi } if [ "$LAUNCHABLE_ENABLED" = "true" ]; then @@ -144,4 +161,4 @@ fi # grouped make install grouped make test-tool grouped make test-all TESTS="$tests" -grouped env CHECK_LEAKS=true make test-spec MSPECOPT="$INPUT_MSPECOPT" +grouped env CHECK_LEAKS=true make test-spec MSPECOPT="$INPUT_MSPECOPT" SPECOPTS="${spec_opts}"