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

scilab: fix test-suite makefiles and util scripts for standard build tools

Browse source
This commit is contained in:
Simon Marchetto 2014-10-20 15:14:05 +02:00
commit 057faf6cac
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
LANGUAGE = scilab LANGUAGE = scilab
SCILAB = @SCILAB@ SCILAB = @SCILAB@
SCILAB_OPT = @SCILABOPT@ SCILAB_OPT = @SCILABOPT@
SCRIPTSUFFIX = _runme.sci SCRIPTSUFFIX = _runme.sci
srcdir = @srcdir@ srcdir = @srcdir@
@ -31,12 +31,11 @@ include $(srcdir)/../common.mk
# Overriden variables # Overriden variables
SRCDIR = ../$(srcdir)/ SRCDIR = ../$(srcdir)/
INCLUDES = $(abspath $(srcdir)/..)
# Local variables # Local variables
TEST_DIR = $*.dir TEST_DIR = $*.dir
RUNME_SCRIPT = $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNME_SCRIPT = $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)
SRC_RUNME_SCRIPT = $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) SRC_RUNME_SCRIPT = $(srcdir)/$(RUNME_SCRIPT)
# Hide too long identifier warnings # Hide too long identifier warnings
SWIGOPT += -w720 SWIGOPT += -w720
@ -57,7 +56,6 @@ SWIGOPT += -w720
+(cd $(TEST_DIR) && $(swig_and_compile_multi_cpp)) +(cd $(TEST_DIR) && $(swig_and_compile_multi_cpp))
cd $(TEST_DIR) && $(run_testcase) cd $(TEST_DIR) && $(run_testcase)
# Logs the test case execution
# Copies files and creates directories needed for the test case # Copies files and creates directories needed for the test case
setup = \ setup = \
if [ ! -d $(TEST_DIR) ]; then \ if [ ! -d $(TEST_DIR) ]; then \
@ -82,7 +80,7 @@ setup = \
# a file is found which has _runme.sci appended after the testcase name. # a file is found which has _runme.sci appended after the testcase name.
run_testcase = \ run_testcase = \
if [ -f $(RUNME_SCRIPT) ]; then ( \ if [ -f $(RUNME_SCRIPT) ]; then ( \
env LD_LIBRARY_PATH=$(srcdir):$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(RUNME_SCRIPT); )\ env LD_LIBRARY_PATH=$(srcdir):$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(RUNME_SCRIPT); ) \
fi fi
# Clean: remove the generated files # Clean: remove the generated files

9
Examples/test-suite/scilab/swigtest.quit
View file

@ -1,11 +1,2 @@
// Clean files
exec("cleaner.sce", -1);
mdelete("builder.sce");
mdelete("cleaner.sce");
mdelete(swigtestname + "_wrap.c");
mdelete(swigtestname + "_wrap.cxx");
mdelete(swigtestname + ".i");
// Exit from Scilab // Exit from Scilab
exit exit