Always use PyPy on Travis for testing/compiling

Use pypy-5.3.1 on Linux provided by Travis
hpi-swa · Feb 27, 2017 · e5cf512 · e5cf512
1 parent b0fbb50
commit e5cf512
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
-language: cpp
+language: python
+python: pypy-5.3.1
 sudo: required
 dist: trusty
 group: edge
@@ -36,12 +37,15 @@ matrix:
   include:
     - os: osx
       osx_image: xcode7.3
+      language: cpp
       env: BUILD_ARCH=64bit TEST_TYPE=default
     - os: osx
       osx_image: xcode7.3
+      language: cpp
       env: BUILD_ARCH=64bit
     - os: osx
       osx_image: xcode7.3
+      language: cpp
       env: BUILD_ARCH=64bit PLUGINS=RubyPlugin
   allow_failures:
     # - env: BUILD_ARCH=64bit PLUGINS=DatabasePlugin

diff --git a/.travis/build-linux.sh b/.travis/build-linux.sh
@@ -21,21 +21,21 @@ fi
 
 case "$BUILD_ARCH" in
   32bit)
-    python .build/build.py --batch --32bit -- $plugins
+    pypy .build/build.py --batch --32bit -- $plugins
     exitcode=$?
     cp rsqueak rsqueak-x86-${UNAME}$plugins_suffix-jit-$TRAVIS_COMMIT || true
-    python .build/jittests.py --32bit || $JITTESTS_FAIL
+    pypy .build/jittests.py --32bit || $JITTESTS_FAIL
     $EX rm -rf .build/pypy/rpython/_cache
     ;;
   64bit)
-    python .build/build.py --batch --64bit -- $plugins
+    pypy .build/build.py --batch --64bit -- $plugins
     exitcode=$?
     cp rsqueak rsqueak-x86_64-${UNAME}$plugins_suffix-jit-$TRAVIS_COMMIT || true
-    python .build/jittests.py --64bit || $JITTESTS_FAIL
+    pypy .build/jittests.py --64bit || $JITTESTS_FAIL
     $EX rm -rf .build/pypy/rpython/_cache
     ;;
   lldebug)
-    python .build/build.py --lldebug -Ojit
+    pypy .build/build.py --lldebug -Ojit
     exitcode=$?
     cp rsqueak rsqueak-x86-${UNAME}-dbg-$TRAVIS_COMMIT || true
     $EX rm -rf .build/pypy/rpython/_cache

diff --git a/.travis/build-macos.sh b/.travis/build-macos.sh
@@ -15,21 +15,21 @@ fi
 
 case "$BUILD_ARCH" in
   32bit)
-    python .build/build.py $plugins
+    pypy .build/build.py $plugins
     exitcode=$?
     cp rsqueak rsqueak-x86-${UNAME}$plugins_suffix-jit-$TRAVIS_COMMIT || true
-    # python .build/jittests.py
+    # pypy .build/jittests.py
     # $EX rm -rf .build/pypy/rpython/_cache
     ;;
   64bit)
     pypy .build/build.py -- $plugins
     exitcode=$?
     cp rsqueak rsqueak-x86_64-${UNAME}$plugins_suffix-jit-$TRAVIS_COMMIT || true
-    # python .build/jittests.py
+    # pypy .build/jittests.py
     # $EX rm -rf .build/pypy/rpython/_cache
     ;;
   lldebug)
-    python .build/build.py --lldebug -Ojit
+    pypy .build/build.py --lldebug -Ojit
     exitcode=$?
     cp rsqueak rsqueak-x86-${UNAME}-dbg-$TRAVIS_COMMIT || true
     # $EX rm -rf .build/pypy/rpython/_cache

diff --git a/.travis/install_requirements.sh b/.travis/install_requirements.sh
@@ -12,9 +12,9 @@ setup_osx() {
       64bit)
       # brew update
 
-      # Use Pypy2 v5.4.0
+      # Use PyPy2 v5.4.0
       brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c5a201f49c9da47d4771ebc544d10b3f9c579021/Formula/pypy.rb
-      
+
       brew install sdl2
       ;;
     esac

diff --git a/.travis/test.sh b/.travis/test.sh
@@ -17,9 +17,4 @@ case "${BUILD_ARCH}" in
   *) ;;
 esac
 
-ex="python"
-if [[ "${TRAVIS_OS_NAME}" == "osx" ]] && [[ "${BUILD_ARCH}" == "64bit" ]]; then
-  ex="pypy"
-fi
-
-${ex} .build/unittests.py -s ${testflag}
+pypy ".build/${testscript}" -s ${testflag}