From: mkr Date: Mon, 17 Aug 2015 08:03:48 +0000 (+0300) Subject: Run tests on Windows platform. X-Git-Tag: V8_0_0a1~10 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=072d2d2cd9276a6cd38c4450292d5f7667ca6dd8;p=modules%2Fgeom.git Run tests on Windows platform. --- diff --git a/doc/salome/examples/testme.py b/doc/salome/examples/testme.py index 0f16a4288..3e0e49698 100755 --- a/doc/salome/examples/testme.py +++ b/doc/salome/examples/testme.py @@ -24,11 +24,21 @@ import unittest, sys, os class SalomeSession(object): def __init__(self, script): import runSalome - sys.argv = ["runSalome.py"] + run_script = "runSalome.py" + if sys.platform == 'win32': + module_dir = os.getenv("KERNEL_ROOT_DIR") + if module_dir: run_script = os.path.join(module_dir, "bin", "salome", run_script) + pass + sys.argv = [run_script] sys.argv += ["--terminal"] sys.argv += ["--modules=GEOM"] sys.argv += ["%s" % script] + if sys.platform == 'win32': + main_module_path = sys.modules['__main__'].__file__ + sys.modules['__main__'].__file__ = '' clt, d = runSalome.main() + if sys.platform == 'win32': + sys.modules['__main__'].__file__ = main_module_path return def __del__(self): diff --git a/src/XAO/tests/TestUtils.hxx b/src/XAO/tests/TestUtils.hxx index a541371bf..1661cc0bb 100644 --- a/src/XAO/tests/TestUtils.hxx +++ b/src/XAO/tests/TestUtils.hxx @@ -40,7 +40,7 @@ namespace XAO { std::ifstream rstr; int length; - rstr.open(filePath.c_str()); + rstr.open(filePath.c_str(), std::ios_base::binary); rstr.seekg(0, rstr.end); // go to the end length = rstr.tellg(); // report location (this is the length) rstr.seekg(0, rstr.beg); // go back to the beginning