From db4c73c6ec576164e151180bed2775f267444574 Mon Sep 17 00:00:00 2001 From: Jacob Beal Date: Thu, 5 Sep 2019 12:31:36 +0200 Subject: [PATCH 1/5] update travis to migrate from trusty to xenial configuration --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6c6ae4f..1cd7690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ language: java +services: + - xvfb cache: - apt env: From 53b14a3c8594eed66b0fec949656ded90b11e7c1 Mon Sep 17 00:00:00 2001 From: jakebeal Date: Wed, 11 Sep 2019 09:21:59 -0500 Subject: [PATCH 2/5] try to add ghostscript --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1cd7690..29a4442 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ services: - xvfb cache: - apt +addons: + apt: + packages: + - ghostscript env: global: - OCTAVE=octave From 29df1f5107df21f10982a490feb3e0abb4dcf7b5 Mon Sep 17 00:00:00 2001 From: jakebeal Date: Wed, 11 Sep 2019 09:31:45 -0500 Subject: [PATCH 3/5] looks like pstoedit is needed too --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 29a4442..17401d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: apt: packages: - ghostscript + - pstoedit env: global: - OCTAVE=octave From ba9a96346db0e48391570d94c29598d2a60ea175 Mon Sep 17 00:00:00 2001 From: jakebeal Date: Wed, 11 Sep 2019 09:58:57 -0500 Subject: [PATCH 4/5] try turning off graphics output --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b1288fc..e02e73a 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ else TEST_RUNNER=moxunit_runtests endif -TEST_INIT=addpath('$(TESTDIR)'); +TEST_INIT=addpath('$(TESTDIR)');TASBEConfig.reset();TASBEConfig.set('testing.fakeFigureSaves',1); TEST=$(ADDPATH);$(TEST_INIT);success=$(TEST_RUNNER)($(RUNTESTS_ARGS));exit(~success); MATLAB_BIN=$(shell which $(MATLAB)) From 98ac3f789732b99d777259b0b36cf5e6a2833aae Mon Sep 17 00:00:00 2001 From: jakebeal Date: Wed, 11 Sep 2019 11:32:00 -0500 Subject: [PATCH 5/5] fix checkpointing so that graphics off continues to be respected during tests --- template_colormodel/bead_comparison.m | 2 +- template_colormodel/make_color_model.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template_colormodel/bead_comparison.m b/template_colormodel/bead_comparison.m index f6364c7..be6c415 100644 --- a/template_colormodel/bead_comparison.m +++ b/template_colormodel/bead_comparison.m @@ -1,4 +1,4 @@ -TASBEConfig.checkpoint('init'); +TASBEConfig.checkpoint(TASBEConfig.checkpoints()); stem0312 = '../example_controls/2012-03-12_'; diff --git a/template_colormodel/make_color_model.m b/template_colormodel/make_color_model.m index 8c05178..f6839ac 100644 --- a/template_colormodel/make_color_model.m +++ b/template_colormodel/make_color_model.m @@ -1,4 +1,4 @@ -TASBEConfig.checkpoint('init'); +TASBEConfig.checkpoint(TASBEConfig.checkpoints()); stem0312 = '../example_controls/2012-03-12_';