diff options
| author | michael tesch <tesch1@gmail.com> | 2014-11-29 02:45:22 +0100 |
|---|---|---|
| committer | michael tesch <tesch1@gmail.com> | 2014-11-29 02:45:22 +0100 |
| commit | 86695f1a41eeb5169684ed373e7e5b49e56cc855 (patch) | |
| tree | 98af2e1831514451d4625c05dd417bc05d46bb0c /Examples/test-suite/matlab/Makefile.in | |
| parent | a10dee3c6c3ff51b1fe9d0b0d1867462afd13fa8 (diff) | |
| download | swig-86695f1a41eeb5169684ed373e7e5b49e56cc855.tar.gz | |
clarify matlab test-suite run output
Diffstat (limited to 'Examples/test-suite/matlab/Makefile.in')
| -rw-r--r-- | Examples/test-suite/matlab/Makefile.in | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/Examples/test-suite/matlab/Makefile.in b/Examples/test-suite/matlab/Makefile.in index 90741c145..bdab90875 100644 --- a/Examples/test-suite/matlab/Makefile.in +++ b/Examples/test-suite/matlab/Makefile.in @@ -3,7 +3,7 @@ ####################################################################### LANGUAGE = matlab -MATLAB = @MATLAB@ -nodisplay -nosplash +MATLAB = @MATLAB@ -nodisplay -nosplash -nojvm SCRIPTSUFFIX = _runme srcdir = @srcdir@ @@ -381,7 +381,7 @@ CPP_TEST_BROKEN += \ apply_signed_char \ apply_strings \ nested_directors \ - special_variables \ + special_variables \ typemap_directorout \ director_abstract \ director_alternating \ @@ -456,8 +456,24 @@ include $(srcdir)/../common.mk # a file is found which has _runme.m appended after the testcase name. run_testcase = \ if [ -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX).m ]; then \ + RUNSCRIPT="\ + try; \ + $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ + catch err; \ + fprintf(1, ['ERROR: ' err.message '\\\n']); \ + fprintf(2, ['ERROR: ' err.message '\\\n']); \ + exit(1); \ + end; \ + exit(0)" ; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MATLABPATH=$(srcdir):$(SCRIPTDIR):$$MATLAB_PATH \ - $(RUNTOOL) $(MATLAB) -r "try; $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); catch err, fprintf(2,['ERROR: ' err.message '\n']),exit(1), end, exit(0)"; \ + $(RUNTOOL) $(MATLAB) -r "$$RUNSCRIPT" $(RUNPIPE); \ + if [ $$? -ne 0 ] ; then \ + echo "\n$* failed" $(RUNPIPE) ; \ + else \ + echo "\n$* passed" $(RUNPIPE) ; \ + fi \ + else \ + echo "skipping test $* : $*$(SCRIPTSUFFIX).m not found" $(RUNPIPE); \ fi # Clean: remove the generated .m file |