Add DISABLE_LLVM_TESTS option to build_aomp.sh.

This allows the source tarball and release to disable llvm tests.
ROCm · Apr 2, 2022 · 02612ba · 02612ba
1 parent 0dd9a7f
commit 02612ba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@
 AOMP ?= $(HOME)/rocm/aomp
 AOMP_REPOS = $(shell pwd)
 all: 
-	AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_CHECK_GIT_BRANCH=0 AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 $(AOMP_REPOS)/aomp/bin/build_prereq.sh
-	AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_CHECK_GIT_BRANCH=0 AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 $(AOMP_REPOS)/aomp/bin/build_aomp.sh
+	AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 $(AOMP_REPOS)/aomp/bin/build_prereq.sh
+	AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 DISABLE_LLVM_TESTS=1 $(AOMP_REPOS)/aomp/bin/build_aomp.sh
 install:
 	@echo "Installation complete to $(AOMP)"
diff --git a/bin/build_aomp.sh b/bin/build_aomp.sh
@@ -90,6 +90,10 @@ if [[ -z $GAWK ]] && [[ "$OS" == *"Ubuntu"* ]] ; then
    exit 1
 fi
 
+if [ "$DISABLE_LLVM_TESTS" == "1" ]; then
+  export DO_TESTS="-DLLVM_INCLUDE_TESTS=OFF -DCLANG_INCLUDE_TESTS=OFF"
+fi
+
 echo 
 date
 echo " =================  START build_aomp.sh ==================="   

diff --git a/bin/build_project.sh b/bin/build_project.sh
@@ -54,7 +54,7 @@ fi
 # also ubuntu 16.04 only has python 3.5 and lit testing needs 3.6 minimum, so turn off
 # testing with ubuntu 16.04 which goes EOL in April 2021.
 PN=$(cat /etc/os-release | grep "^PRETTY_NAME=" | cut -d= -f2)
-DO_TESTS="-DLLVM_BUILD_TESTS=ON -DLLVM_INCLUDE_TESTS=ON -DCLANG_INCLUDE_TESTS=ON"
+DO_TESTS=${DO_TESTS:-"-DLLVM_BUILD_TESTS=ON -DLLVM_INCLUDE_TESTS=ON -DCLANG_INCLUDE_TESTS=ON"}
 #-DCOMPILER_RT_INCLUDE_TESTS=OFF"
 
 if [ $AOMP_STANDALONE_BUILD == 1 ] ; then