summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRye <rye@lindenlab.com>2024-10-15 23:07:27 -0700
committerRye <rye@lindenlab.com>2024-10-31 22:50:40 -0700
commit0aa139298a8c18e8c01198a8a50b1ea17606341f (patch)
tree33d95ab07512ddb2410439354c0c167b4fc033ee
parent0ae72a24eb07bbb2cb15402c6b85b53ab50a6d7a (diff)
Enable linux tests
-rwxr-xr-xbuild.sh10
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake4
2 files changed, 3 insertions, 11 deletions
diff --git a/build.sh b/build.sh
index edd0c5a6d9..f2376e706b 100755
--- a/build.sh
+++ b/build.sh
@@ -201,17 +201,9 @@ 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 \
+ -DLL_TESTS:BOOL=ON \
-DPACKAGE:BOOL=ON \
-DHAVOK:BOOL="$HAVOK" \
-DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index e98c77497b..bae3dc5d94 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -200,7 +200,6 @@ elseif(LINUX)
libortp.so
libvivoxoal.so.1
libvivoxsdk.so
- libSDL2.so
)
set(slvoice_files SLVoice)
@@ -214,7 +213,8 @@ elseif(LINUX)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
# *FIX - figure out what to do with duplicate libalut.so here -brad
set(release_files
- )
+ libSDL2-2.0.so.0
+ )
if( USE_AUTOBUILD_3P )
list( APPEND release_files