diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-05-30 13:44:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-30 13:44:54 -0400 |
| commit | 94794138f1fd5c7468c3f96f2d30bf34a810c4f4 (patch) | |
| tree | b3112eeeeed45fc865f0272459be77a75ef9c1a0 | |
| parent | a8b6112eb7cbdb65fa16f88e1bba473fecefb5a6 (diff) | |
| parent | 3ccfcf9c8f0a6c27af6bfcfaca9c27b52e8a2e48 (diff) | |
Merge pull request #1393 from secondlife/nat/maint-b-tests
Turn on LL_TESTS for Maint B.
| -rwxr-xr-x | build.sh | 9 | ||||
| -rw-r--r-- | indra/llcommon/tests/llstring_test.cpp | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -192,8 +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=$LL_TESTS \ -DPACKAGE:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ 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); |