summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@osg.samsung.com>2017-01-03 15:34:39 -0300
committerThibault Saunier <thibault.saunier@osg.samsung.com>2017-01-03 15:34:39 -0300
commitf6d0636466d04c92a43ec53cbe767a50ff27b352 (patch)
treedc9e130647022470a648ab32ea094ac3a586edaf
parent2863986ea3367f093923727da4578061be5ca340 (diff)
validate:launcher: Fix running on windows
-rw-r--r--validate/launcher/baseclasses.py7
-rw-r--r--validate/launcher/config.py.in6
-rwxr-xr-xvalidate/tools/gst-validate-launcher.in9
3 files changed, 11 insertions, 11 deletions
diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py
index 43d58b5884..bfb7dd4dff 100644
--- a/validate/launcher/baseclasses.py
+++ b/validate/launcher/baseclasses.py
@@ -51,10 +51,9 @@ TIMEOUT_FACTOR = float(os.environ.get("TIMEOUT_FACTOR", 1))
VALGRIND_ERROR_CODE = 20
VALIDATE_OVERRIDE_EXTENSION = ".override"
-COREDUMP_SIGNALS = [-signal.SIGQUIT, -signal.SIGILL, -signal.SIGABRT,
- -signal.SIGFPE, -signal.SIGSEGV, -signal.SIGBUS, -signal.SIGSYS,
- -signal.SIGTRAP, -signal.SIGXCPU, -signal.SIGXFSZ, -signal.SIGIOT,
- 139]
+COREDUMP_SIGNALS = [-getattr(signal, s) for s in [
+ 'SIGQUIT', 'SIGILL', 'SIGABRT', 'SIGFPE', 'SIGSEGV', 'SIGBUS', 'SIGSYS',
+ 'SIGTRAP', 'SIGXCPU', 'SIGXFSZ', 'SIGIOT'] if hasattr(signal, s)] + [139]
class Test(Loggable):
diff --git a/validate/launcher/config.py.in b/validate/launcher/config.py.in
index e501c65db0..51a5e585fb 100644
--- a/validate/launcher/config.py.in
+++ b/validate/launcher/config.py.in
@@ -17,7 +17,7 @@
# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301, USA.
-LIBDIR = '@LIBDIR@'
-DATADIR = '@DATADIR@'
-BUILDDIR = '@BUILDDIR@'
+LIBDIR = r'@LIBDIR@'
+DATADIR = r'@DATADIR@'
+BUILDDIR = r'@BUILDDIR@'
GST_VALIDATE_TESTSUITE_VERSION = '@GST_VALIDATE_TESTSUITE_VERSION@'
diff --git a/validate/tools/gst-validate-launcher.in b/validate/tools/gst-validate-launcher.in
index bc38c3ddb8..7b33149820 100755
--- a/validate/tools/gst-validate-launcher.in
+++ b/validate/tools/gst-validate-launcher.in
@@ -21,9 +21,9 @@ import os
import subprocess
import sys
-LIBDIR = '@LIBDIR@'
-BUILDDIR = '@BUILDDIR@'
-SRCDIR = '@SRCDIR@'
+LIBDIR = r'@LIBDIR@'
+BUILDDIR = r'@BUILDDIR@'
+SRCDIR = r'@SRCDIR@'
GIT_FIRST_HASH = 'da962d096af9460502843e41b7d25fdece7ff1c2'
@@ -47,11 +47,12 @@ def _in_devel():
def _add_gst_launcher_path():
+ f = os.path.abspath(__file__)
if _in_devel():
print("Running with development path")
dir_ = os.path.dirname(os.path.abspath(__file__))
root = os.path.split(dir_)[0]
- elif __file__.startswith(BUILDDIR):
+ elif f.startswith(BUILDDIR):
# Make sure to have the configured config.py in the python path
sys.path.insert(0, os.path.abspath(os.path.join(BUILDDIR, "..")))
root = os.path.abspath(os.path.join(SRCDIR, "../"))