split out build vs test some more

.travis.yml

@@ -96,10 +96,10 @@ install:
 - source src/travis/$TRAVIS_OS_NAME-$PLATFORM-install.sh
 
 script:
-- gam/gam version extended
+- $gam version extended
-- gam/gam version | grep "Python 3\.7\.3" # We should be building with Python 3.7.3
+- $gam version | grep travis # travis should be part of the path (not /tmp or such)
-- gam/gam version | grep travis # travis should be part of the path (not /tmp or such)
+- if [ "$VMTYPE" == "build" ]; then $gam version | grep "Python 3\.7\.3"; fi # We should be building with Python 3.7.3
-- gam/gam version extended | grep TLSv1\.[23] # We should support TLS 1.2 or 1.3 to Google
+- if [ "$VMTYPE" == "build" ]; then $gam version extended | grep TLSv1\.[23]; fi # Builds should support TLS 1.2 or 1.3 to Google
 
 before_deploy:
 - export TRAVIS_TAG="preview"

src/travis/linux-x86_64-before-install.sh

@@ -68,6 +68,7 @@ else
     sudo apt-get install --yes patchelf scons musl
     $pip install git+https://github.com/JonathonReinhart/staticx.git@master
   fi
+  $pip install pyinstaller
   cd $whereibelong
 fi
 
@@ -75,4 +76,3 @@ echo "Upgrading pip packages..."
 $pip freeze > upgrades.txt
 $pip install --upgrade -r upgrades.txt
 $pip install -r src/requirements.txt
-$pip install pyinstaller

src/travis/linux-x86_64-install.sh

@@ -1,7 +1,10 @@
 cd src
+if [ "$VMTYPE" == "test" ]; then
+  export gam="$python gam.py"
+else
   $python -OO -m PyInstaller --clean --debug -F --distpath=gam $GAMOS-gam.spec
-gam/gam version extended
+  export gam="gam/gam"
-export GAMVERSION=`gam/gam version simple`
+  export GAMVERSION=`$gam version simple`
   cp LICENSE gam
   cp whatsnew.txt gam
   cp GamCommands.txt gam
@@ -10,7 +13,7 @@ GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-glibc$this_glibc_ver.tar.xz
   tar cfJ $GAM_ARCHIVE gam/
   echo "PyInstaller GAM info:"
   du -h gam/gam
-time gam/gam version extended
+  time $gam version extended
 
   if [[ "$dist" == "xenial" ]]; then
     GAM_LEGACY_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-legacy.tar.xz
@@ -21,5 +24,6 @@ if [[ "$dist" == "xenial" ]]; then
     tar cfJ $GAM_LEGACY_ARCHIVE gam/
     echo "Legacy StaticX GAM info:"
     du -h gam/gam
-  time gam/gam version extended
+    time $gam version extended
+  fi
 fi

src/travis/osx-x86_64-install.sh

@@ -1,6 +1,7 @@
 cd src
 $python -OO -m PyInstaller --clean --debug -F --distpath=gam $GAMOS-gam.spec
-gam/gam version
+export gam="gam/gam"
+$gam version extended
 export GAMVERSION=`gam/gam version simple`
 cp LICENSE gam
 cp whatsnew.txt gam

src/travis/windows-x86-install.sh

@@ -1,7 +1,8 @@
 cd src
 pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
-gam/gam version
+export gam="gam/gam"
-export GAMVERSION=`gam/gam version simple`
+$gam version extended
+export GAMVERSION=`$gam version simple`
 cp LICENSE gam
 cp GamCommands.txt gam
 cp whatsnew.txt gam

src/travis/windows-x86_64-install.sh

@@ -1,7 +1,8 @@
 cd src
 pyinstaller --clean -F --distpath=gam $GAMOS-gam.spec
-gam/gam version
+export gam="gam/gam"
-export GAMVERSION=`gam/gam version simple`
+$gam version
+export GAMVERSION=`$gam version simple`
 cp LICENSE gam
 cp GamCommands.txt gam
 cp whatsnew.txt gam