From 9478143689cbfc934c51ad73508174c36b426d33 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sat, 11 Mar 2017 21:49:54 -0500 Subject: [PATCH 01/14] Initial .travis.yml push, experimental. original commit: ec7a7f9968bdc1852948a1be69f098b37a296532 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..b455aa397c --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: c From 1b4ddd640c7aed87b3fe6e55f7535b2d975fe3bf Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sat, 11 Mar 2017 23:12:33 -0500 Subject: [PATCH 02/14] Second try on .travis.yml, this time on correct branch hopefully. original commit: 523f6a0a92b2c6ef0f82a596689ae515392dfeca --- .travis.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.travis.yml b/.travis.yml index b455aa397c..8bfd43e55f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,24 @@ language: c +os: + - linux + - osx +matrix: + include: + - os: osx + env: TARGET_MACHINE=i3osx + - os: osx + env: TARGET_MACHINE=ti3osx + - os: osx + env: TARGET_MACHINE=a6osx + - os: osx + env: TARGET_MACHINE=ta6osx + - os: linux + env: TARGET_MACHINE=i3le + - os: linux + env: TARGET_MACHINE=ti3le + - os: linux + env: TARGET_MACHINE=a6le + - os: linux + env: TARGET_MACHINE=ta6le +script: + - ./configure $TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' From 3a9a7dc7b0a1cfdc9c7aaed4750fe21f7decb4b4 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sat, 11 Mar 2017 23:21:18 -0500 Subject: [PATCH 03/14] Change to (hopefully) eliminate extraneous configurations. original commit: eb22ad1f69742ec61b0653cdce0b3a7f8cb0dbb5 --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bfd43e55f..924dc74c3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,4 @@ language: c -os: - - linux - - osx matrix: include: - os: osx @@ -21,4 +18,4 @@ matrix: - os: linux env: TARGET_MACHINE=ta6le script: - - ./configure $TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' + - ./configure -m=$TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' From 4dc75cdd65af00efacd1ab91b6323ef67356cfc4 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sat, 11 Mar 2017 23:50:03 -0500 Subject: [PATCH 04/14] Altering the settings for i3le and ti3le to install 32-bit library support. original commit: 6c3fb7a1445c64e8f57362a1768b42462cffc324 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 924dc74c3f..cba0b7c23d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,8 @@ matrix: env: TARGET_MACHINE=a6le - os: linux env: TARGET_MACHINE=ta6le +install: + - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then apt-get update -y ; fi + - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then apt-get install -y libc6-dev-x32 libc6-x32 lib32ncurses5 lib32ncurses5-dev ; fi script: - ./configure -m=$TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' From 8e31239ab7f2115fd7202255132ced3f4ec18469 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sat, 11 Mar 2017 23:54:36 -0500 Subject: [PATCH 05/14] Fixing the apt-get sudo requirement for the Linux x86 builds. original commit: ff0bd879b353ad688dca7d3d284a62227ac285f0 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cba0b7c23d..811d8115d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: c +sudo: required matrix: include: - os: osx @@ -18,7 +19,7 @@ matrix: - os: linux env: TARGET_MACHINE=ta6le install: - - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then apt-get update -y ; fi - - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then apt-get install -y libc6-dev-x32 libc6-x32 lib32ncurses5 lib32ncurses5-dev ; fi + - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get update -y ; fi + - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get install -y libc6-dev-x32 libc6-x32 lib32ncurses5 lib32ncurses5-dev ; fi script: - ./configure -m=$TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' From 26e49c19e6a141910176fcf481ae70c43146a199 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 00:00:27 -0500 Subject: [PATCH 06/14] Apparently, apt list does not give a list of names that apt-get understands, trying again with the "canonical" 32-bit install libs. original commit: d89d8ff47594ecc765f2c2db3fd8aa7da1d6a951 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 811d8115d3..dbd5cc0126 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,6 @@ matrix: env: TARGET_MACHINE=ta6le install: - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get update -y ; fi - - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get install -y libc6-dev-x32 libc6-x32 lib32ncurses5 lib32ncurses5-dev ; fi + - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get install -y lib32z1 lib32ncurses5 lib32bz2-1.0 ; fi script: - ./configure -m=$TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' From 2fa0a276acb963c18ed0dd9cd237ecaf96f1feea Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 13:29:21 -0400 Subject: [PATCH 07/14] Fix to install ia32-libs as well, since we seem to be running on 12.04 sometimes. original commit: 06b12864c4c5d8a504fd8d1972c718ceac55a8f6 --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbd5cc0126..afe77d78c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,24 +2,24 @@ language: c sudo: required matrix: include: - - os: osx - env: TARGET_MACHINE=i3osx - - os: osx - env: TARGET_MACHINE=ti3osx - - os: osx - env: TARGET_MACHINE=a6osx - - os: osx - env: TARGET_MACHINE=ta6osx +# - os: osx +# env: TARGET_MACHINE=i3osx +# - os: osx +# env: TARGET_MACHINE=ti3osx +# - os: osx +# env: TARGET_MACHINE=a6osx +# - os: osx +# env: TARGET_MACHINE=ta6osx - os: linux env: TARGET_MACHINE=i3le - - os: linux - env: TARGET_MACHINE=ti3le - - os: linux - env: TARGET_MACHINE=a6le - - os: linux - env: TARGET_MACHINE=ta6le +# - os: linux +# env: TARGET_MACHINE=ti3le +# - os: linux +# env: TARGET_MACHINE=a6le +# - os: linux +# env: TARGET_MACHINE=ta6le install: - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get update -y ; fi - - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get install -y lib32z1 lib32ncurses5 lib32bz2-1.0 ; fi + - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get install -y ia32-libs lib32z1 lib32ncurses5 lib32bz2-1.0 ; fi script: - ./configure -m=$TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' From d4461c71227dd6daf710bf439c8767984634d244 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 13:56:58 -0400 Subject: [PATCH 08/14] Trying again with a mats/Mf-base that has a reduced list of tests. original commit: 3beb71c45fc331198c6cd4c58f980425418910b1 --- .travis.yml | 2 +- mats/Mf-base | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index afe77d78c7..2bcc8ceb0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,4 @@ install: - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get update -y ; fi - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get install -y ia32-libs lib32z1 lib32ncurses5 lib32bz2-1.0 ; fi script: - - ./configure -m=$TARGET_MACHINE && make && make test 2>&1 | tee Make.out | grep '^matting ' + - ./configure -m=$TARGET_MACHINE && make && ( cd ${TARGET_MACHINE}/mats && make partialx 2>&1 ) | tee Make.out | grep '^matting ' diff --git a/mats/Mf-base b/mats/Mf-base index 3a74048221..0353c41320 100644 --- a/mats/Mf-base +++ b/mats/Mf-base @@ -203,6 +203,14 @@ fastreport: $(MAKE) doerrors $(MAKE) doreport +partialx: + $(MAKE) allxhelp o=0 + $(MAKE) allxhelp o=3 + $(MAKE) allxhelp o=0 cp0=t + $(MAKE) allxhelp o=3 cp0=t + $(MAKE) allxhelp o=0 spi=t rmg=2 p=t + $(MAKE) allxhelp o=3 eval=interpret cp0=t rmg=2 + allx: prettyclean $(MAKE) allxhelp o=0 $(MAKE) allxhelp o=3 From f7a74f0cbbdbbbe5ea05cae53c0f359548b22244 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 14:04:48 -0400 Subject: [PATCH 09/14] Attempting to use the addons feature, travis lint says no, but the online docs say yes. original commit: 7505f22c46888caf0edd1110ef4a6cc4ec00931f --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bcc8ceb0e..c247fcee82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: c -sudo: required matrix: include: -# - os: osx -# env: TARGET_MACHINE=i3osx + - os: osx + env: TARGET_MACHINE=i3osx # - os: osx # env: TARGET_MACHINE=ti3osx # - os: osx @@ -18,8 +17,12 @@ matrix: # env: TARGET_MACHINE=a6le # - os: linux # env: TARGET_MACHINE=ta6le -install: - - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get update -y ; fi - - if [[ "$TARGET_MACHINE" == "i3le" || "$TARGET_MACHINE" == "ti3le" ]] ; then sudo apt-get install -y ia32-libs lib32z1 lib32ncurses5 lib32bz2-1.0 ; fi +dist: trusty +addons: + apt: + packages: + - lib32z1 + - lib32ncurses5 + - lib32bz2 script: - ./configure -m=$TARGET_MACHINE && make && ( cd ${TARGET_MACHINE}/mats && make partialx 2>&1 ) | tee Make.out | grep '^matting ' From 1bedb14887c763547410d53994f44000b222a5c3 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 14:08:49 -0400 Subject: [PATCH 10/14] Trying again with gcc-multilib instead of explicit library installs. original commit: 9cbf6fe2c7c4ce26fd203e0fa6e0c00c6a4fbbf0 --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c247fcee82..6cfca27245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,6 @@ dist: trusty addons: apt: packages: - - lib32z1 - - lib32ncurses5 - - lib32bz2 + - gcc-multilib script: - ./configure -m=$TARGET_MACHINE && make && ( cd ${TARGET_MACHINE}/mats && make partialx 2>&1 ) | tee Make.out | grep '^matting ' From d32433bcd71997046a25b3b1e349d9bf6f488ddd Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 14:13:42 -0400 Subject: [PATCH 11/14] Adding lib32ncurses and libx32ncurses. original commit: 06f07a57b86ed83239ceb5274c43e359eb7b8e79 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6cfca27245..8f5efe7a5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,7 @@ addons: apt: packages: - gcc-multilib + - lib32ncurses5-dev + - libx32ncurses5-dev script: - ./configure -m=$TARGET_MACHINE && make && ( cd ${TARGET_MACHINE}/mats && make partialx 2>&1 ) | tee Make.out | grep '^matting ' From 2c195c5ce7a12641a8651accc9f34bdafab59ea9 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 14:51:09 -0400 Subject: [PATCH 12/14] Re-enabling the other build types. original commit: a8fb8c049d84e5664b4e1d9f405c55f643116b9d --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f5efe7a5a..57f68df9ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,20 +3,20 @@ matrix: include: - os: osx env: TARGET_MACHINE=i3osx -# - os: osx -# env: TARGET_MACHINE=ti3osx -# - os: osx -# env: TARGET_MACHINE=a6osx -# - os: osx -# env: TARGET_MACHINE=ta6osx + - os: osx + env: TARGET_MACHINE=ti3osx + - os: osx + env: TARGET_MACHINE=a6osx + - os: osx + env: TARGET_MACHINE=ta6osx - os: linux env: TARGET_MACHINE=i3le -# - os: linux -# env: TARGET_MACHINE=ti3le -# - os: linux -# env: TARGET_MACHINE=a6le -# - os: linux -# env: TARGET_MACHINE=ta6le + - os: linux + env: TARGET_MACHINE=ti3le + - os: linux + env: TARGET_MACHINE=a6le + - os: linux + env: TARGET_MACHINE=ta6le dist: trusty addons: apt: From f60d06c4e90cd8797b72e1d67e40caec35f9c4b2 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 14:56:04 -0400 Subject: [PATCH 13/14] adding travis-ci automation to the master branch. added travis-ci automation script and a 'partialx' testing target to allow us to perform more than a single run of testing without running afoul of travis-ci's 50-minute build timeout. 'partialx' tests six of the twelve configurations tested by 'allx'. .travis.yml (new), mats/Mf-base original commit: fdc8dc40e95b0977ab7bc07636585b71e56802a3 --- LOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/LOG b/LOG index 60d8fbb286..33b3290bde 100644 --- a/LOG +++ b/LOG @@ -350,3 +350,9 @@ by the System V ABI. x86_64.ss, foreign.ms +- added travis-ci automation script and a 'partialx' testing target to + allow us to perform more than a single run of testing without running + afoul of travis-ci's 50-minute build timeout. 'partialx' tests six + of the twelve configurations tested by 'allx'. + .travis.yml (new), + mats/Mf-base From 33987d340107a08aef3e56a2db961466d2953c27 Mon Sep 17 00:00:00 2001 From: Andy Keep Date: Sun, 12 Mar 2017 16:28:40 -0400 Subject: [PATCH 14/14] reduced tests to conform to the travis-ci limits. paired the 'partialx' down to just four test configurations, with one interpreter run, to try to get the threaded builds into line with travis-ci's timeout. mats/Mf-base original commit: 6d8c871cd60228755660395e96087878ca9d040f --- LOG | 4 ++++ mats/Mf-base | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/LOG b/LOG index 33b3290bde..6064e8cdc0 100644 --- a/LOG +++ b/LOG @@ -356,3 +356,7 @@ of the twelve configurations tested by 'allx'. .travis.yml (new), mats/Mf-base +- paired the 'partialx' down to just four test configurations, with one + interpreter run, to try to get the threaded builds into line with + travis-ci's timeout. + mats/Mf-base diff --git a/mats/Mf-base b/mats/Mf-base index 0353c41320..44726efe49 100644 --- a/mats/Mf-base +++ b/mats/Mf-base @@ -206,9 +206,7 @@ fastreport: partialx: $(MAKE) allxhelp o=0 $(MAKE) allxhelp o=3 - $(MAKE) allxhelp o=0 cp0=t $(MAKE) allxhelp o=3 cp0=t - $(MAKE) allxhelp o=0 spi=t rmg=2 p=t $(MAKE) allxhelp o=3 eval=interpret cp0=t rmg=2 allx: prettyclean