Skip to content

Commit 7227a60

Browse files
authored
Merge pull request #72 from TASBE/trusty-to-xenial-migration
update travis to migrate from trusty to xenial configuration
2 parents 8e5f3a0 + 98ac3f7 commit 7227a60

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@
66

77
language: java
88

9+
services:
10+
- xvfb
911
cache:
1012
- apt
13+
addons:
14+
apt:
15+
packages:
16+
- ghostscript
17+
- pstoedit
1118
env:
1219
global:
1320
- OCTAVE=octave

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ else
9090
TEST_RUNNER=moxunit_runtests
9191
endif
9292

93-
TEST_INIT=addpath('$(TESTDIR)');
93+
TEST_INIT=addpath('$(TESTDIR)');TASBEConfig.reset();TASBEConfig.set('testing.fakeFigureSaves',1);
9494
TEST=$(ADDPATH);$(TEST_INIT);success=$(TEST_RUNNER)($(RUNTESTS_ARGS));exit(~success);
9595

9696
MATLAB_BIN=$(shell which $(MATLAB))

template_colormodel/bead_comparison.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TASBEConfig.checkpoint('init');
1+
TASBEConfig.checkpoint(TASBEConfig.checkpoints());
22

33
stem0312 = '../example_controls/2012-03-12_';
44

template_colormodel/make_color_model.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TASBEConfig.checkpoint('init');
1+
TASBEConfig.checkpoint(TASBEConfig.checkpoints());
22

33
stem0312 = '../example_controls/2012-03-12_';
44

0 commit comments

Comments
 (0)