From a2c2aaec8097a94cb6fce514caa1058b4aeb99b8 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Wed, 24 Sep 2014 11:44:38 +0200
Subject: [PATCH] scilab: fix test-suite (scripts were not executed)

---
 Examples/test-suite/scilab/Makefile.in    |  4 ++--
 Examples/test-suite/scilab/swigtest.quit  | 20 +++++++-------------
 Examples/test-suite/scilab/swigtest.start |  7 ++-----
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Examples/test-suite/scilab/Makefile.in b/Examples/test-suite/scilab/Makefile.in
index b14e3770d..f43feb87c 100644
--- a/Examples/test-suite/scilab/Makefile.in
+++ b/Examples/test-suite/scilab/Makefile.in
@@ -33,7 +33,7 @@ INCLUDES = $(abspath $(srcdir)/..)
 
 # Local variables
 TEST_DIR = $*.dir
-RUNME_SCRIPT = $(TEST_DIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)
+RUNME_SCRIPT = $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)
 SRC_RUNME_SCRIPT = $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)
 
 # Hide too long identifier warnings
@@ -80,7 +80,7 @@ setup = \
 # a file is found which has _runme.sci appended after the testcase name.
 run_testcase = \
 	if [ -f $(RUNME_SCRIPT) ]; then ( \
-		env LD_LIBRARY_PATH=$(srcdir)/$(TEST_DIR):$$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
 
 # Clean: remove the generated files
diff --git a/Examples/test-suite/scilab/swigtest.quit b/Examples/test-suite/scilab/swigtest.quit
index ed48aec2e..a55bd9c9b 100644
--- a/Examples/test-suite/scilab/swigtest.quit
+++ b/Examples/test-suite/scilab/swigtest.quit
@@ -1,17 +1,11 @@
 // Clean files
 
-exec(fullfile(testdir, "cleaner.sce"), -1);
-
-mdelete(fullfile(testdir, "builder.sce"));
-mdelete(fullfile(testdir, "cleaner.sce"));
-mdelete(fullfile(testdir, swigtestname + "_wrap.c"));
-mdelete(fullfile(testdir, swigtestname + "_wrap.cxx"));
-mdelete(fullfile(testdir, swigtestname + ".i"));
-removedir(testdir);
-
-//mprintf("******************\n")
-//mprintf("* TEST SUCCEEDED *\n")
-//mprintf("******************\n")
+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
\ No newline at end of file
+exit
diff --git a/Examples/test-suite/scilab/swigtest.start b/Examples/test-suite/scilab/swigtest.start
index 5df6d275b..e4347bd90 100644
--- a/Examples/test-suite/scilab/swigtest.start
+++ b/Examples/test-suite/scilab/swigtest.start
@@ -6,19 +6,16 @@ ilib_verbose(0);
 [units, typ, names] = file(1);
 swigtestname = strsubst(fileparts(names, "fname"), "_runme", "");
 
-// Test build dir
-testdir = swigtestname + ".dir";
-
 // Does the library exists? If not then exit!
 libname = "lib" + swigtestname + getdynlibext();
-if ~isfile(fullfile(testdir, libname)) then
+if ~isfile(libname) then
     mfprintf(0, "*** LIBRARY NOT FOUND: %s ***\n", libname);
     exit(1)
 end
 
 // Load library
 try
-    exec(fullfile(testdir, "loader.sce"), -1);
+    exec("loader.sce", -1);
 catch
     mfprintf(0, "*** LOADER EXECUTION FAILED ***\n");
     exit(1)