From ffc20033bef8e221107882536023215041c2ec7e Mon Sep 17 00:00:00 2001 From: Simon Marchetto Date: Wed, 4 Sep 2013 17:38:36 +0200 Subject: [PATCH 1/5] Scilab: fix test cases compilation error (header not found) --- Examples/test-suite/scilab/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/test-suite/scilab/Makefile.in b/Examples/test-suite/scilab/Makefile.in index c39776217..107a8f973 100644 --- a/Examples/test-suite/scilab/Makefile.in +++ b/Examples/test-suite/scilab/Makefile.in @@ -6,9 +6,9 @@ LANGUAGE = scilab SCILAB = @SCILAB@ SCILAB_STARTOPT = @SCILABSTARTOPT@ SCRIPTSUFFIX = _runme.sci -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ +srcdir = $(abspath @srcdir@) +top_srcdir = $(abspath @top_srcdir@) +top_builddir = $(abspath @top_builddir@) # Overridden variables here From 08b779aee25b06e11dd3e5144566c07bd38df5dd Mon Sep 17 00:00:00 2001 From: Simon Marchetto Date: Wed, 4 Sep 2013 17:42:19 +0200 Subject: [PATCH 2/5] Scilab: return exit code 1 from Scilab when module build fails (for Travis test-suite status) --- Source/Modules/scilab.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Modules/scilab.cxx b/Source/Modules/scilab.cxx index 9da7a9f42..20438eb30 100644 --- a/Source/Modules/scilab.cxx +++ b/Source/Modules/scilab.cxx @@ -210,12 +210,17 @@ public: /* Write all to the builder.sce file */ Printf(builderCode, "];\n"); + Printf(builderCode, "ret = 1;\n"); Printf(builderCode, "if ~isempty(table) then\n"); Printf(builderCode, " ilib_build(ilib_name, table, files, libs, [], ldflags, cflags);\n"); + Printf(builderCode, " libfilename = 'lib' + ilib_name + getdynlibext();\n"); + Printf(builderCode, " if isfile(libfilename) & isfile('loader.sce') then\n"); + Printf(builderCode, " ret = 0;\n"); + Printf(builderCode, " end\n"); Printf(builderCode, "end\n"); Printf(builderCode, "cd(originaldir);\n"); - Printf(builderCode, "exit"); + Printf(builderCode, "exit(ret)"); builderFile = NewFile(NewStringf("%sbuilder.sce", SWIG_output_directory()), "w", SWIG_output_files()); Printv(builderFile, builderCode, NIL); Delete(builderFile); From 74cd6281defd2081ff1d9eef877d461eebb153ef Mon Sep 17 00:00:00 2001 From: Simon Marchetto Date: Fri, 6 Sep 2013 10:20:33 +0200 Subject: [PATCH 3/5] Scilab: ignore test ignore_template_constructor (no support of vector yet) --- Examples/test-suite/ignore_template_constructor.i | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Examples/test-suite/ignore_template_constructor.i b/Examples/test-suite/ignore_template_constructor.i index ffd541986..ae466d711 100644 --- a/Examples/test-suite/ignore_template_constructor.i +++ b/Examples/test-suite/ignore_template_constructor.i @@ -36,6 +36,8 @@ public: #endif +#if !defined(SWIGSCILAB) + %template(VectFlow) std::vector; %inline %{ @@ -43,3 +45,5 @@ std::vector inandout(std::vector v) { return v; } %} + +#endif From c0cc7be2e61aeceae3461ce804781daf9d199773 Mon Sep 17 00:00:00 2001 From: Simon Marchetto Date: Fri, 6 Sep 2013 10:34:53 +0200 Subject: [PATCH 4/5] Scilab: remove test verbose messages --- Examples/test-suite/scilab/swigtest.start | 1 + 1 file changed, 1 insertion(+) diff --git a/Examples/test-suite/scilab/swigtest.start b/Examples/test-suite/scilab/swigtest.start index 586a1bc62..42fafb833 100644 --- a/Examples/test-suite/scilab/swigtest.start +++ b/Examples/test-suite/scilab/swigtest.start @@ -1,4 +1,5 @@ lines(0); +ilib_verbose(0); // Get test name (used in swigtest.quit file) [units, typ, names] = file(1); From 1d19663efdd7a221086b5a5d6f74ef7d0ec76a80 Mon Sep 17 00:00:00 2001 From: Simon Marchetto Date: Fri, 6 Sep 2013 14:46:51 +0200 Subject: [PATCH 5/5] Scilab: fix test suite copy file error --- Examples/test-suite/scilab/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/test-suite/scilab/Makefile.in b/Examples/test-suite/scilab/Makefile.in index 107a8f973..e67a7cc6c 100644 --- a/Examples/test-suite/scilab/Makefile.in +++ b/Examples/test-suite/scilab/Makefile.in @@ -32,14 +32,14 @@ swig_and_compile_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \ - TARGET="$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ + TARGET="$(OUTDIR)/$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ scilab_cpp swig_and_compile_c = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \ - TARGET="$*_wrap.c" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ + TARGET="$(OUTDIR)/$*_wrap.c" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ scilab swig_and_compile_multi_cpp = \ @@ -47,7 +47,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \ - TARGET="$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ + TARGET="$(OUTDIR)/$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ scilab_cpp; \ done