summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorPierre Marechal <pierre.marechal@scilab.org>2007-11-12 14:18:40 +0000
committerPierre Marechal <pierre.marechal@scilab.org>2007-11-12 14:18:40 +0000
commitad9646f91c73762ddda9dedd3c7ec402bfa07e9f (patch)
treec0685eed796abe96c77c5d9c9f680200227c7bc4 /scilab/modules
parentaefe95417c11036ea9a1f497848c40ff866234ff (diff)
downloadscilab-ad9646f91c73762ddda9dedd3c7ec402bfa07e9f.zip
scilab-ad9646f91c73762ddda9dedd3c7ec402bfa07e9f.tar.gz
Fix the scilab binary path for "make install" versions
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/development_tools/macros/unit_test_run.sci22
1 files changed, 18 insertions, 4 deletions
diff --git a/scilab/modules/development_tools/macros/unit_test_run.sci b/scilab/modules/development_tools/macros/unit_test_run.sci
index c23841f..27eac83 100644
--- a/scilab/modules/development_tools/macros/unit_test_run.sci
+++ b/scilab/modules/development_tools/macros/unit_test_run.sci
@@ -409,11 +409,18 @@ function [status_id,status_msg,status_details] = unit_test_run_checkerror(module
409 // and save it in a temporary file 409 // and save it in a temporary file
410 mputl(txt,tmp_tstfile); 410 mputl(txt,tmp_tstfile);
411 411
412 // Gestion de l'emplacement de bin/scilab
413 if (~MSDOS) & (fileinfo(SCI+"/bin/scilab")==[]) then
414 SCI_BIN = strsubst(SCI,'share/scilab','');
415 else
416 SCI_BIN = SCI;
417 end
418
412 // Build the command to launch 419 // Build the command to launch
413 if MSDOS then 420 if MSDOS then
414 unit_test_cmd = "( """+SCI+"\bin\scilex.exe"+""""+" "+launch_mode+" -nb -args -nouserstartup -f """+tmp_tstfile+""" > """+tmp_resfile+""" ) 2> """+tmp_errfile+""""; 421 unit_test_cmd = "( """+SCI_BIN+"\bin\scilex.exe"+""""+" "+launch_mode+" -nb -args -nouserstartup -f """+tmp_tstfile+""" > """+tmp_resfile+""" ) 2> """+tmp_errfile+"""";
415 else 422 else
416 unit_test_cmd = "( "+SCI+"/bin/scilab "+launch_mode+" -nb -args -nouserstartup -f "+tmp_tstfile+" > "+tmp_resfile+" ) 2> "+tmp_errfile; 423 unit_test_cmd = "( "+SCI_BIN+"/bin/scilab "+launch_mode+" -nb -args -nouserstartup -f "+tmp_tstfile+" > "+tmp_resfile+" ) 2> "+tmp_errfile;
417 end 424 end
418 425
419 // Launch the test exec 426 // Launch the test exec
@@ -568,11 +575,18 @@ function [status_id,status_msg,status_details] = unit_test_run_proc_ref(module,t
568 deletefile(diafile) 575 deletefile(diafile)
569 end 576 end
570 577
578 // Gestion de l'emplacement de bin/scilab
579 if (~MSDOS) & (fileinfo(SCI+"/bin/scilab")==[]) then
580 SCI_BIN = strsubst(SCI,'share/scilab','');
581 else
582 SCI_BIN = SCI;
583 end
584
571 // Build the command to launch 585 // Build the command to launch
572 if MSDOS then 586 if MSDOS then
573 unit_test_cmd = "( """+SCI+"\bin\scilex.exe"+""""+" "+launch_mode+" -nb -args -nouserstartup -f """+tmp_tstfile+""" > """+tmp_resfile+""" ) 2> """+tmp_errfile+""""; 587 unit_test_cmd = "( """+SCI_BIN+"\bin\scilex.exe"+""""+" "+launch_mode+" -nb -args -nouserstartup -f """+tmp_tstfile+""" > """+tmp_resfile+""" ) 2> """+tmp_errfile+"""";
574 else 588 else
575 unit_test_cmd = "( "+SCI+"/bin/scilab "+launch_mode+" -nb -args -nouserstartup -f "+tmp_tstfile+" > "+tmp_resfile+" ) 2> "+tmp_errfile; 589 unit_test_cmd = "( "+SCI_BIN+"/bin/scilab "+launch_mode+" -nb -args -nouserstartup -f "+tmp_tstfile+" > "+tmp_resfile+" ) 2> "+tmp_errfile;
576 end 590 end
577 591
578 // Launch the test exec 592 // Launch the test exec