From 173fa2b5ac34ab5e71b6a50209e287499fb1ec59 Mon Sep 17 00:00:00 2001 From: Antoine ELIAS Date: Fri, 20 Sep 2013 16:02:27 +0200 Subject: [PATCH] update some dynamic_link tests to create tmp files in scilab tmp dir instead of os tmp dir Change-Id: I6b105d8fbb53265864ba19499d7b735400e5a0da --- .../tests/nonreg_tests/bug_2085.dia.ref | 1 - .../dynamic_link/tests/nonreg_tests/bug_2085.tst | 1 - .../tests/nonreg_tests/bug_3191.dia.ref | 3 +-- .../dynamic_link/tests/nonreg_tests/bug_3191.tst | 1 - .../tests/nonreg_tests/bug_3392.dia.ref | 3 +-- .../dynamic_link/tests/nonreg_tests/bug_3392.tst | 1 - .../tests/nonreg_tests/bug_3630.dia.ref | 3 +-- .../dynamic_link/tests/nonreg_tests/bug_3630.tst | 1 - .../tests/nonreg_tests/bug_3639.dia.ref | 1 - .../dynamic_link/tests/nonreg_tests/bug_3639.tst | 1 - 10 files changed, 3 insertions(+), 13 deletions(-) diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.dia.ref index 61d453f..cc8ca46 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.dia.ref +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.dia.ref @@ -17,7 +17,6 @@ ilib_verbose(0); test_path = get_absolute_file_path('bug_2085.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); mkdir(OS_TMP_DIR,'bug_2085'); TEST_DIR = OS_TMP_DIR + filesep() + 'bug_2085'; diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.tst index f0c3f80..84872fa 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.tst +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.tst @@ -24,7 +24,6 @@ test_path = get_absolute_file_path('bug_2085.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.dia.ref index 9cc4aac..d0058e0 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.dia.ref +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.dia.ref @@ -15,7 +15,6 @@ ilib_verbose(0); test_path = get_absolute_file_path('bug_3191.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); mkdir(OS_TMP_DIR,'bug_3191'); TEST_DIR = OS_TMP_DIR + filesep() + 'bug_3191'; @@ -23,7 +22,7 @@ copyfile(SCI+'/modules/dynamic_link/tests/nonreg_tests/bug_3191.c' , TEST_DIR + chdir(TEST_DIR); files=['bug_3191.c']; ilib_build('libc_fun',['c_fun','c_intfun'],files,[]); -// load the shared library +// load the shared library exec loader.sce; chdir(currentpath); //using the new primitive diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.tst index 613344d..75f464f 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.tst +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.tst @@ -21,7 +21,6 @@ test_path = get_absolute_file_path('bug_3191.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.dia.ref index 63514ef..6718baf 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.dia.ref +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.dia.ref @@ -15,7 +15,6 @@ ilib_verbose(0); test_path = get_absolute_file_path('bug_3392.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); mkdir(OS_TMP_DIR,'bug_3392'); TEST_DIR = OS_TMP_DIR + filesep() + 'bug_3392'; @@ -23,7 +22,7 @@ copyfile(SCI+'/modules/dynamic_link/tests/nonreg_tests/bug_3392.c' , TEST_DIR + chdir(TEST_DIR); files=['bug_3392.c']; ilib_build('libc_fun',['c_sum','c_intsum';'c_sub','c_intsub'],files,[]); -// load the shared library +// load the shared library exec loader.sce; chdir(currentpath); //using the new primitive diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.tst index fc56c4b..d295df9 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.tst +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.tst @@ -21,7 +21,6 @@ test_path = get_absolute_file_path('bug_3392.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.dia.ref index 9c15689..b94c9dd 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.dia.ref +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.dia.ref @@ -16,7 +16,6 @@ ilib_verbose(0); test_path = get_absolute_file_path('bug_3630.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); mkdir(OS_TMP_DIR,'bug_3630'); TEST_DIR = OS_TMP_DIR + filesep() + 'bug_3630'; @@ -26,7 +25,7 @@ files=['bug_3630.c']; ilib_build('libc_fun',['c_sum','c_intsum';'c_sub','c_intsub'],files,[]); [primitives1,commandes] = what(); nbprimitives1 = size(primitives1,'*'); -// load the shared library +// load the shared library exec loader.sce; chdir(currentpath); [primitives2,commandes] = what(); diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.tst index 5280151..6a5dbea 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.tst +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.tst @@ -22,7 +22,6 @@ test_path = get_absolute_file_path('bug_3630.tst'); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.dia.ref index eb8bb10..ec7f43a 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.dia.ref +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.dia.ref @@ -17,7 +17,6 @@ ilib_verbose(0); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); TEST_NAME = 'bug_3639_1'; mkdir(OS_TMP_DIR, TEST_NAME); diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.tst index bfc2396..d8c1e52 100644 --- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.tst +++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.tst @@ -19,7 +19,6 @@ ilib_verbose(0); currentpath = pwd(); cd TMPDIR; -cd ../; OS_TMP_DIR = pwd(); TEST_NAME = 'bug_3639_1'; -- 1.7.9.5