Permalink
Browse files

travis: use build matrix instead of testme script

  • Loading branch information...
1 parent feaa319 commit c5b57cfee463c64cff6cf3eab370e7c5f43ac1a9 @sjaeckel sjaeckel committed Feb 16, 2014
Showing with 35 additions and 15 deletions.
  1. +18 −1 .travis.yml
  2. +16 −0 printinfo.sh
  3. +1 −14 testme.sh
View
@@ -1,7 +1,24 @@
language: c
compiler:
- gcc
-script: ./testme.sh "makefile" "-DUSE_LTM -DLTM_DESC -DLTC_NO_ASM -I/usr/include" /usr/lib/libtommath.a
+script: bash "${BUILDSCRIPT}" "${BUILDNAME}" "${BUILDOPTIONS}" "makefile" "-DUSE_LTM -DLTM_DESC -I/usr/include" "/usr/lib/libtommath.a"
+env:
+ - BUILDSCRIPT="printinfo.sh" BUILDNAME="" BUILDOPTIONS=""
+ - BUILDSCRIPT="run.sh" BUILDNAME="STOCK" BUILDOPTIONS=" "
+ - BUILDSCRIPT="run.sh" BUILDNAME="SMALL" BUILDOPTIONS="-DLTC_SMALL_CODE"
+ - BUILDSCRIPT="run.sh" BUILDNAME="NOTABLES" BUILDOPTIONS="-DLTC_NO_TABLES"
+ - BUILDSCRIPT="run.sh" BUILDNAME="SMALL+NOTABLES" BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_NO_TABLES"
+ - BUILDSCRIPT="run.sh" BUILDNAME="CLEANSTACK" BUILDOPTIONS="-DLTC_CLEAN_STACK"
+ - BUILDSCRIPT="run.sh" BUILDNAME="CLEANSTACK+SMALL" BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_CLEAN_STACK"
+ - BUILDSCRIPT="run.sh" BUILDNAME="CLEANSTACK+NOTABLES" BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK"
+ - BUILDSCRIPT="run.sh" BUILDNAME="CLEANSTACK+NOTABLES+SMALL" BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE"
+ - BUILDSCRIPT="run.sh" BUILDNAME="NO_FAST" BUILDOPTIONS="-DLTC_NO_FAST"
+ - BUILDSCRIPT="run.sh" BUILDNAME="NO_FAST+NOTABLES" BUILDOPTIONS="-DLTC_NO_FAST -DLTC_NO_TABLES"
+ - BUILDSCRIPT="run.sh" BUILDNAME="NO_ASM" BUILDOPTIONS="-DLTC_NO_ASM"
+ - BUILDSCRIPT="testbuild.sh" BUILDNAME="NOTEST" BUILDOPTIONS="-DLTC_NO_TEST"
+ - BUILDSCRIPT="testbuild.sh" BUILDNAME="NOFILE" BUILDOPTIONS="-DLTC_NO_TEST"
+matrix:
+ fast_finish: true
branches:
only:
- develop
View
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+version=$(git describe --tags --always --dirty 2>/dev/null)
+if [ ! -e ".git" ] || [ -z $version ]
+then
+ version=$(grep "^VERSION=" makefile | sed "s/.*=//")
+fi
+echo "Testing version:" $version
+#grep "VERSION=" makefile | perl -e "@a = split('=', <>); print @a[1];"`
+
+# get uname
+echo "uname="`uname -a`
+
+# get gcc name
+echo "gcc="`gcc -dumpversion`
+echo
View
@@ -11,20 +11,7 @@ fi
echo "date="`date`
# output version
-version=$(git describe --tags --always --dirty 2>/dev/null)
-if [ ! -e ".git" ] || [ -z $version ]
-then
- version=$(grep "^VERSION=" makefile | sed "s/.*=//")
-fi
-echo "Testing version:" $version
-#grep "VERSION=" makefile | perl -e "@a = split('=', <>); print @a[1];"`
-
-# get uname
-echo "uname="`uname -a`
-
-# get gcc name
-echo "gcc="`gcc -dumpversion`
-echo
+bash printinfo.sh
# stock build
bash run.sh "STOCK" " " "$1" "$2" "$3" || exit 1

0 comments on commit c5b57cf

Please sign in to comment.