Browse Source

Compilation system: on windows OSes, do not use the loader application when calling make check

Nathalie Furmento 14 years ago
parent
commit
66c12a69dc
2 changed files with 15 additions and 3 deletions
  1. 8 1
      examples/Makefile.am
  2. 7 2
      tests/Makefile.am

+ 8 - 1
examples/Makefile.am

@@ -120,14 +120,21 @@ noinst_HEADERS = 				\
 #####################################
 
 STARPU_EXAMPLES	=
-check_PROGRAMS	=	$(LOADER) $(STARPU_EXAMPLES)
 TESTS		=	$(STARPU_EXAMPLES)
 
+if STARPU_HAVE_WINDOWS
+check_PROGRAMS	=	$(STARPU_EXAMPLES)
+else
+check_PROGRAMS	=	$(LOADER) $(STARPU_EXAMPLES)
+endif
+
+if !STARPU_HAVE_WINDOWS
 ## test loader program
 LOADER			=	loader
 LOADER_BIN		=	$(abs_top_builddir)/examples/$(LOADER)
 loader_SOURCES		=	../tests/loader.c
 TESTS_ENVIRONMENT	=	$(LOADER_BIN)
+endif
 
 examplebin_PROGRAMS +=				\
 	basic_examples/hello_world		\

+ 7 - 2
tests/Makefile.am

@@ -79,10 +79,12 @@ testbindir = $(libdir)/starpu/tests
 # What to install and what to check #
 #####################################
 
+if !STARPU_HAVE_WINDOWS
 ## test loader program
 LOADER			=	loader
 LOADER_BIN		=	$(abs_top_builddir)/tests/$(LOADER)
 TESTS_ENVIRONMENT	=	$(LOADER_BIN)
+endif
 
 TESTS = $(testbin_PROGRAMS)
 
@@ -164,8 +166,11 @@ testbin_PROGRAMS =				\
 	perfmodels/regression_based		\
 	perfmodels/non_linear_regression_based
 
-check_PROGRAMS =				\
-	$(LOADER) $(testbin_PROGRAMS)
+if STARPU_HAVE_WINDOWS
+check_PROGRAMS = $(testbin_PROGRAMS)
+else
+check_PROGRAMS = $(LOADER) $(testbin_PROGRAMS)
+endif
 
 #######################
 # Source files        #