More changes.

tsachiherman · Jun 16, 2021 · 19490d4 · 19490d4
1 parent f937799
commit 19490d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/scripts/travis/after_build.sh b/scripts/travis/after_build.sh
@@ -8,18 +8,10 @@
 #
 # Examples: scripts/travis/after_build.sh
 
-SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-OS=$("${SCRIPTPATH}/../ostype.sh")
-if [[ "${OS}" == "darwin" ]]; then
-    # do not run these on darwin
-    exit;
-fi;
-
 if [ "${TRAVIS_EVENT_TYPE}" = "cron" ] || [[ "${TRAVIS_BRANCH}" =~ ^rel/ ]]; then
     if [ "${BUILD_TYPE}" != "integration" ]; then
         cd "$(dirname "$0")"/../.. || exit 1
         make prof
-        make cover
         rm ./node/node.test
     fi;
 fi;
diff --git a/scripts/travis/run_tests.sh b/scripts/travis/run_tests.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
-OS=$("${SCRIPTPATH}/../ostype.sh")
-
 if [ "${BUILD_TYPE}" = "integration" ]; then
     # Run short tests when doing pull requests; leave the long testing for nightly runs.
     if [[ "${TRAVIS_BRANCH}" =~ ^rel/nightly ]]; then
@@ -15,11 +12,7 @@ if [ "${BUILD_TYPE}" = "integration" ]; then
     export SHORTTEST 
     make integration
 elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ] || [[ "${TRAVIS_BRANCH}" =~ ^rel/ ]]; then
-    if [[ "${OS}" != "darwin" ]]; then
-        make fulltest -j2
-    fi
+    make fulltest -j2
 else
-    # setting it to 1 disable parallel making. This is done specicifically for travis, as travis seems to
-    # have memory limitations and setting this to 1 could reduce the likelihood of hitting these.
-    make shorttest -j1
+    make shorttest -j2
 fi