jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scilab: Make the build process non-interactive.

Browse source 
When Scilab encounters an error in builder.sce, it leaves the user with
an interactive scilab-cli shell. This is undesirable when executing test
cases.

This patch makes Scilab exit with an error code instead.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-scilab@13148 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Wolfgang Frisch 2012-06-04 07:45:30 +00:00
commit 15d5d89b2f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/Makefile.in
View file

@ -1192,7 +1192,7 @@ scilab: $(SRCS)
fi \
fi
@if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo "exit(1)" |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \
fi
# ----------------------------------------------------------------
@ -1214,7 +1214,7 @@ scilab_cpp: $(SRCS)
fi \
fi
@if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo "exit(1)" |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \
fi
# -----------------------------------------------------------------

2
Examples/test-suite/scilab/Makefile.in
View file

@ -37,7 +37,7 @@ include $(srcdir)/../common.mk
# a file is found which has _runme.sci appended after the testcase name.
run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) echo "exit(1)" |$(SCILAB) -nwni -nb -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ; ) \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) echo 'exit(1)' |$(SCILAB) -nwni -nb -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ; ) \
fi;
# Clean: remove the generated .sci file