|
@@ -2,7 +2,7 @@
|
|
|
*
|
|
|
* Copyright (C) 2011,2012,2017 Inria
|
|
|
* Copyright (C) 2011-2020 CNRS
|
|
|
- * Copyright (C) 2010,2014-2018 Université de Bordeaux
|
|
|
+ * Copyright (C) 2010,2014-2018,2020 Université de Bordeaux
|
|
|
*
|
|
|
* StarPU is free software; you can redistribute it and/or modify
|
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
@@ -291,6 +291,28 @@ int main(int argc, char *argv[])
|
|
|
if (launcher_args)
|
|
|
launcher_args=strdup(launcher_args);
|
|
|
|
|
|
+ if (launcher)
|
|
|
+ {
|
|
|
+ const char *top_srcdir = getenv("top_srcdir");
|
|
|
+ decode(&launcher, "@top_srcdir@", top_srcdir);
|
|
|
+ decode(&launcher_args, "@top_srcdir@", top_srcdir);
|
|
|
+ }
|
|
|
+
|
|
|
+ size_t len = strlen(test_name);
|
|
|
+ if (launcher && len >= 3 &&
|
|
|
+ test_name[len-3] == '.' &&
|
|
|
+ test_name[len-2] == 's' &&
|
|
|
+ test_name[len-1] == 'h')
|
|
|
+ {
|
|
|
+
|
|
|
+ it the decoded variables */
|
|
|
+ setenv("STARPU_CHECK_LAUNCHER", launcher, 1);
|
|
|
+ if (launcher_args)
|
|
|
+ setenv("STARPU_CHECK_LAUNCHER_ARGS", launcher_args, 1);
|
|
|
+ launcher = NULL;
|
|
|
+ launcher_args = NULL;
|
|
|
+ }
|
|
|
+
|
|
|
setenv("STARPU_OPENCL_PROGRAM_DIR", STARPU_SRC_DIR, 1);
|
|
|
|
|
|
|
|
@@ -309,7 +331,6 @@ int main(int argc, char *argv[])
|
|
|
* after the Libtool-generated wrapper scripts, hence
|
|
|
* this special-case. */
|
|
|
const char *top_builddir = getenv ("top_builddir");
|
|
|
- const char *top_srcdir = getenv("top_srcdir");
|
|
|
if (top_builddir != NULL)
|
|
|
{
|
|
|
char *launcher_argv[100];
|
|
@@ -319,9 +340,6 @@ int main(int argc, char *argv[])
|
|
|
strcpy(libtool, top_builddir);
|
|
|
strcat(libtool, "/libtool");
|
|
|
|
|
|
- decode(&launcher, "@top_srcdir@", top_srcdir);
|
|
|
- decode(&launcher_args, "@top_srcdir@", top_srcdir);
|
|
|
-
|
|
|
launcher_argv[0] = libtool;
|
|
|
launcher_argv[1] = "--mode=execute";
|
|
|
launcher_argv[2] = launcher;
|