From 42470a6312770002183b741eebed2ef8d12e78f7 Mon Sep 17 00:00:00 2001 From: Vincent COUVERT Date: Thu, 20 Sep 2012 23:01:05 +0200 Subject: [PATCH] Deactivate this test under Mac OS X (uses tclsci module) Change-Id: Ib76bcef5269d2dc743cd4e0293fd76a5f5d26579 --- .../tests/nonreg_tests/bug_3802.dia.ref | 6 ++++-- .../localization/tests/nonreg_tests/bug_3802.tst | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scilab/modules/localization/tests/nonreg_tests/bug_3802.dia.ref b/scilab/modules/localization/tests/nonreg_tests/bug_3802.dia.ref index 02708eb..5c920c8 100644 --- a/scilab/modules/localization/tests/nonreg_tests/bug_3802.dia.ref +++ b/scilab/modules/localization/tests/nonreg_tests/bug_3802.dia.ref @@ -13,5 +13,7 @@ // When Scilab is launched in French, Tcl creates error (when it is working // in english) // <-- FRENCH IMPOSED --> -TclCMD="TCL_EvalStr(""destroy .t;pack [text .t];set ts [expr 12/[tk scaling]];.t conf -tabs $ts;.t cget -tabs"")"; -if execstr(TclCMD, "errcatch")<>0 then bugmes();quit;end +if getos() <> "Darwin" then + TclCMD="TCL_EvalStr(""destroy .t;pack [text .t];set ts [expr 12/[tk scaling]];.t conf -tabs $ts;.t cget -tabs"")"; + if execstr(TclCMD, "errcatch")<>0 then bugmes();quit;end +end diff --git a/scilab/modules/localization/tests/nonreg_tests/bug_3802.tst b/scilab/modules/localization/tests/nonreg_tests/bug_3802.tst index 6a56a8a..02bc16d 100644 --- a/scilab/modules/localization/tests/nonreg_tests/bug_3802.tst +++ b/scilab/modules/localization/tests/nonreg_tests/bug_3802.tst @@ -15,5 +15,8 @@ // in english) // <-- FRENCH IMPOSED --> -TclCMD="TCL_EvalStr(""destroy .t;pack [text .t];set ts [expr 12/[tk scaling]];.t conf -tabs $ts;.t cget -tabs"")"; -if execstr(TclCMD, "errcatch")<>0 then pause; end +if getos() <> "Darwin" then + TclCMD="TCL_EvalStr(""destroy .t;pack [text .t];set ts [expr 12/[tk scaling]];.t conf -tabs $ts;.t cget -tabs"")"; + if execstr(TclCMD, "errcatch")<>0 then pause; end + end + \ No newline at end of file -- 1.7.9.5