Salome HOME
projects
/
tools
/
sat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improvement for check command. See Tuleap 2160
[tools/sat.git]
/
src
/
compilation.py
diff --git
a/src/compilation.py
b/src/compilation.py
index 1de64d2acd16e60d62912168f901982f3b2cd182..11be8dbd945ad926c90cd0ac6e73277a97f54e34 100644
(file)
--- a/
src/compilation.py
+++ b/
src/compilation.py
@@
-298,18
+298,21
@@
CC=\\"hack_libtool\\"%g" libtool'''
##
# Runs 'make_check'.
##
# Runs 'make_check'.
- def check(self):
+ def check(self
, command=""
):
if src.architecture.is_windows():
if src.architecture.is_windows():
- c
omman
d = 'msbuild RUN_TESTS.vcxproj'
+ c
m
d = 'msbuild RUN_TESTS.vcxproj'
else :
if self.product_info.build_source=="autotools" :
else :
if self.product_info.build_source=="autotools" :
- c
omman
d = 'make check'
+ c
m
d = 'make check'
else:
else:
- command = 'make test'
-
- self.log_command(command)
+ cmd = 'make test'
+
+ if command:
+ cmd = command
+
+ self.log_command(cmd)
- res = subprocess.call(c
omman
d,
+ res = subprocess.call(c
m
d,
shell=True,
cwd=str(self.build_dir),
env=self.launch_environ.environ.environ,
shell=True,
cwd=str(self.build_dir),
env=self.launch_environ.environ.environ,
@@
-323,7
+326,10
@@
CC=\\"hack_libtool\\"%g" libtool'''
##
# Performs a default build for this module.
##
# Performs a default build for this module.
- def do_default_build(self, build_conf_options="", configure_options="", show_warning=True):
+ def do_default_build(self,
+ build_conf_options="",
+ configure_options="",
+ show_warning=True):
use_autotools = False
if 'use_autotools' in self.product_info:
uc = self.product_info.use_autotools
use_autotools = False
if 'use_autotools' in self.product_info:
uc = self.product_info.use_autotools