From 0eaca22969fb14402a898325a64276e1c11dff0c Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 2 May 2024 15:59:42 -0400 Subject: Try suppressing #include (fails on Linux). --- indra/llmessage/tests/llmockhttpclient.h | 2 +- indra/test/test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llmessage/tests/llmockhttpclient.h b/indra/llmessage/tests/llmockhttpclient.h index af26bf8803..0afe2d386a 100644 --- a/indra/llmessage/tests/llmockhttpclient.h +++ b/indra/llmessage/tests/llmockhttpclient.h @@ -31,7 +31,7 @@ #include "linden_common.h" #include "llhttpclientinterface.h" -#include +//#include class LLMockHTTPClient : public LLHTTPClientInterface { diff --git a/indra/test/test.cpp b/indra/test/test.cpp index f1c5991330..88d75989e5 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -60,7 +60,7 @@ typedef struct { size_t re_nsub; size_t re_erroffset; } regex_t; -#include +//#include #include #endif -- cgit v1.2.3 From e3e3ec336f2d2fb7dd5a8c951a4baa02ac5b1078 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 16 May 2024 14:29:14 -0400 Subject: Try turning on Maint B tests: Linux platform overrides with OFF. --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 0edbca386d..e5c53c84d2 100755 --- a/build.sh +++ b/build.sh @@ -194,6 +194,7 @@ pre_build() "$autobuild" configure --quiet -c $variant \ ${eval_autobuild_configure_parameters:---} \ + -DLL_TESTS:BOOL=ON \ -DPACKAGE:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ -- cgit v1.2.3 From e980dffd5c08bdaad745e47d062c4e7c4c968a6e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 16 May 2024 14:48:14 -0400 Subject: Linux clang++ doesn't like implicit conversion of extreme ints. Try specifying the literal constants in the type we're comparing to. --- indra/llcommon/tests/llstring_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp index 3fadfa5334..ea5b0ee5fc 100644 --- a/indra/llcommon/tests/llstring_test.cpp +++ b/indra/llcommon/tests/llstring_test.cpp @@ -377,7 +377,7 @@ namespace tut { F32 value; std::string str_val("2147483647"); //0x7FFFFFFF - ensure("1: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 2147483647); + ensure("1: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 2147483647.f); str_val = "0"; ensure("2: convertToF32 failed", LLStringUtil::convertToF32(str_val, value) && value == 0); @@ -399,7 +399,7 @@ namespace tut { F64 value; std::string str_val("9223372036854775807"); //0x7FFFFFFFFFFFFFFF - ensure("1: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 9223372036854775807LL); + ensure("1: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 9223372036854775807.); str_val = "0"; ensure("2: convertToF64 failed", LLStringUtil::convertToF64(str_val, value) && value == 0.0F); -- cgit v1.2.3 From e6c476fc1f6276b007aee3a4555b5eccf7b1dfa2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 16 May 2024 15:05:04 -0400 Subject: Set continue-on-error=true so Linux failures don't block. --- .github/workflows/build.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 86ddeca182..73c110277f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,9 +13,12 @@ jobs: matrix: runner: [windows-large, macos-12-xl, linux-large] configuration: [Release, ReleaseOS] + Linux: [false] include: - runner: macos-12-xl developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer" + - runner: linux-large + Linux: true exclude: - runner: windows-large configuration: ReleaseOS @@ -24,6 +27,8 @@ jobs: - runner: linux-large configuration: Release runs-on: ${{ matrix.runner }} + # Linux build failures shouldn't block the whole project. + continue-on-error: ${{ matrix.Linux }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} viewer_version: ${{ steps.build.outputs.viewer_version }} -- cgit v1.2.3 From 865125d9da247f8828240060862782020964bf93 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 16 May 2024 15:09:41 -0400 Subject: Don't introduce a fourth build (second Linux build) --- .github/workflows/build.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 73c110277f..542b8762ef 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,12 +13,9 @@ jobs: matrix: runner: [windows-large, macos-12-xl, linux-large] configuration: [Release, ReleaseOS] - Linux: [false] include: - runner: macos-12-xl developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer" - - runner: linux-large - Linux: true exclude: - runner: windows-large configuration: ReleaseOS @@ -28,7 +25,7 @@ jobs: configuration: Release runs-on: ${{ matrix.runner }} # Linux build failures shouldn't block the whole project. - continue-on-error: ${{ matrix.Linux }} + continue-on-error: ${{ runner.os == 'Linux' }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} viewer_version: ${{ steps.build.outputs.viewer_version }} -- cgit v1.2.3 From 06c37b091f445827b9274a2aec45b9928c6f3081 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 16 May 2024 15:11:40 -0400 Subject: Can't reference 'runner' context at job level. --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 542b8762ef..4adda46b5a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ jobs: configuration: Release runs-on: ${{ matrix.runner }} # Linux build failures shouldn't block the whole project. - continue-on-error: ${{ runner.os == 'Linux' }} + continue-on-error: ${{ matrix.runner == 'linux-large' }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} viewer_version: ${{ steps.build.outputs.viewer_version }} -- cgit v1.2.3 From 3ccfcf9c8f0a6c27af6bfcfaca9c27b52e8a2e48 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 30 May 2024 11:27:27 -0400 Subject: Disable build-time tests on Linux entirely. Having done that, fall back to default `continue-on-error: false` for all platforms. --- .github/workflows/build.yaml | 2 -- build.sh | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4fe018f3cf..903d54210e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,8 +53,6 @@ jobs: - runner: linux-large configuration: Release runs-on: ${{ matrix.runner }} - # Linux build failures shouldn't block the whole project. - continue-on-error: ${{ matrix.runner == 'linux-large' }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} viewer_version: ${{ steps.build.outputs.viewer_version }} diff --git a/build.sh b/build.sh index e5c53c84d2..60c62970df 100755 --- a/build.sh +++ b/build.sh @@ -192,9 +192,17 @@ pre_build() # honor autobuild_configure_parameters same as sling-buildscripts eval_autobuild_configure_parameters=$(eval $(echo echo $autobuild_configure_parameters)) + # We build the viewer on Linux, but we haven't committed to support the + # Linux viewer. As of 2024-05-30, Linux build-time test infrastructure is + # not in place, so don't even bother running tests on Linux. + if [[ "$RUNNER_OS" == "Linux" ]] + then LL_TESTS=OFF + else LL_TESTS=ON + fi + "$autobuild" configure --quiet -c $variant \ ${eval_autobuild_configure_parameters:---} \ - -DLL_TESTS:BOOL=ON \ + -DLL_TESTS:BOOL=$LL_TESTS \ -DPACKAGE:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ -- cgit v1.2.3