Browse Source

Avoid hardcoding the src dir in installed binaries just for opencl tests

Samuel Thibault 6 years ago
parent
commit
186c17739a
2 changed files with 4 additions and 11 deletions
  1. 1 10
      src/drivers/opencl/driver_opencl_utils.c
  2. 3 1
      tests/loader.c

+ 1 - 10
src/drivers/opencl/driver_opencl_utils.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2017                                Université de Bordeaux
+ * Copyright (C) 2010-2018                                Université de Bordeaux
  * Copyright (C) 2011,2012,2016                           Inria
  * Copyright (C) 2010-2018                                CNRS
  *
@@ -70,15 +70,6 @@ int _starpu_opencl_locate_file(const char *source_file_name, char **located_file
 
 	if (ret == EXIT_FAILURE)
 	{
-		_STARPU_CALLOC(*located_file_name, 1, strlen(STARPU_SRC_DIR)+1+strlen(source_file_name)+1);
-		snprintf(*located_file_name, strlen(STARPU_SRC_DIR)+1+strlen(source_file_name)+1, "%s/%s", STARPU_SRC_DIR, source_file_name);
-		_STARPU_DEBUG("Trying to locate <%s>\n", *located_file_name);
-		if (access(*located_file_name, R_OK) == 0)
-			ret = EXIT_SUCCESS;
-	}
-
-	if (ret == EXIT_FAILURE)
-	{
 		_STARPU_CALLOC(*located_file_name, 1, strlen(_STARPU_STRINGIFY(STARPU_OPENCL_DATADIR))+1+strlen(source_file_name)+1);
 		snprintf(*located_file_name, strlen(_STARPU_STRINGIFY(STARPU_OPENCL_DATADIR))+1+strlen(source_file_name)+1, "%s/%s", _STARPU_STRINGIFY(STARPU_OPENCL_DATADIR), source_file_name);
 		_STARPU_DEBUG("Trying to locate <%s>\n", *located_file_name);

+ 3 - 1
tests/loader.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011,2012,2017                           Inria
  * Copyright (C) 2011-2018                                CNRS
- * Copyright (C) 2010,2014-2017                           Université de Bordeaux
+ * Copyright (C) 2010,2014-2018                           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
@@ -274,6 +274,8 @@ int main(int argc, char *argv[])
 		/* This extensively tests various schedulers, let it run longer */
 		timeout *= 10;
 
+	setenv("STARPU_OPENCL_PROGRAM_DIR", STARPU_SRC_DIR, 1);
+
 	/* set SIGALARM handler */
 	sa.sa_flags = 0;
 	sigemptyset(&sa.sa_mask);