From 5f55ee889e1d0a67e2a3b8c59cc49cd39982a1d2 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 6 Sep 2004 15:23:24 +0000 Subject: [PATCH] Fix paths git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@400 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- testsuite/Makefile.am | 66 ++++++++++++++++---------------- testsuite/gras/datadesc_usage.c | 2 +- testsuite/gras/trp_file_client.c | 2 +- testsuite/gras/trp_file_server.c | 2 +- testsuite/gras/trp_tcp_client.c | 2 +- testsuite/gras/trp_tcp_server.c | 2 +- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 4fd3052259..045ce708a2 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -4,28 +4,28 @@ AM_CFLAGS=-g CLEANFILES = *~ test a.out *.o datadesc_usage.out MAINTAINERCLEANFILES=Makefile.in EXTRA_DIST=run_tests.in \ - datadesc.little32 datadesc.little64 datadesc.big32 datadesc.big64 \ - mk_datadesc_structs.pl + gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \ + gras/mk_datadesc_structs.pl # Test stuff -core_tests = \ - dynar_int dynar_double dynar_string \ - dict_usage dict_crash \ - set_usage \ - log_usage -# config_usage -# multidict_crash +gros_tests = \ + gros/dynar_int gros/dynar_double gros/dynar_string \ + gros/dict_usage gros/dict_crash \ + gros/set_usage \ + gros/log_usage +# gros/config_usage +# gros/multidict_crash RL_tests = \ - trp_tcp_client trp_tcp_server \ - trp_file_client trp_file_server \ - datadesc_usage + gras/trp_tcp_client gras/trp_tcp_server \ + gras/trp_file_client gras/trp_file_server \ + gras/datadesc_usage SG_tests = -check_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests) -check_SCRIPTS = run_tests trp_tcp_usage +check_PROGRAMS = $(gros_tests) $(RL_tests) $(SG_tests) +check_SCRIPTS = run_tests gras/trp_tcp_usage TESTS=run_tests test: $(noinst_PROGRAMS) $(noinst_SCRIPTS) @@ -34,30 +34,30 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS) ./run_tests valgrind # LDADD_UTILS is still a separate var to distinguish core tester from RL tester -LDADD_UTILS=$(top_builddir)/src/base/libgrasrl.la -LDADD_RL= $(top_builddir)/src/base/libgrasrl.la +LDADD_UTILS=$(top_builddir)/src/libgrasrl.la +LDADD_RL= $(top_builddir)/src/libgrasrl.la -log_usage_LDADD= $(LDADD_UTILS) +gros_log_usage_LDADD= $(LDADD_UTILS) -dynar_int_LDADD= $(LDADD_UTILS) -dynar_double_LDADD= $(LDADD_UTILS) -dynar_string_LDADD= $(LDADD_UTILS) +gros_dynar_int_LDADD= $(LDADD_UTILS) +gros_dynar_double_LDADD= $(LDADD_UTILS) +gros_dynar_string_LDADD= $(LDADD_UTILS) -dict_usage_LDADD= $(LDADD_UTILS) -dict_crash_LDADD= $(LDADD_UTILS) -#multidict_crash_LDADD= $(LDADD_UTILS) +gros_dict_usage_LDADD= $(LDADD_UTILS) +gros_dict_crash_LDADD= $(LDADD_UTILS) +#gros_multidict_crash_LDADD= $(LDADD_UTILS) -set_usage_LDADD= $(LDADD_UTILS) +gros_set_usage_LDADD= $(LDADD_UTILS) -config_usage_LDADD= $(LDADD_UTILS) +gros_config_usage_LDADD= $(LDADD_UTILS) -trp_tcp_client_LDADD= $(LDADD_RL) -trp_tcp_server_LDADD= $(LDADD_RL) -trp_file_client_LDADD= $(LDADD_RL) -trp_file_server_LDADD= $(LDADD_RL) +gras_trp_tcp_client_LDADD= $(LDADD_RL) +gras_trp_tcp_server_LDADD= $(LDADD_RL) +gras_trp_file_client_LDADD= $(LDADD_RL) +gras_trp_file_server_LDADD= $(LDADD_RL) -datadesc_usage_SOURCES= datadesc_usage.c datadesc_structs.c -datadesc_usage_LDADD= $(LDADD_RL) +gras_datadesc_usage_SOURCES= gras/datadesc_usage.c gras/datadesc_structs.c +gras_datadesc_usage_LDADD= $(LDADD_RL) -datadesc_structs.c: mk_datadesc_structs.pl - perl mk_datadesc_structs.pl > datadesc_structs.c +gras/datadesc_structs.c: gras/mk_datadesc_structs.pl + cd gras ; perl mk_datadesc_structs.pl > datadesc_structs.c diff --git a/testsuite/gras/datadesc_usage.c b/testsuite/gras/datadesc_usage.c index e513e316c7..902f6b5806 100644 --- a/testsuite/gras/datadesc_usage.c +++ b/testsuite/gras/datadesc_usage.c @@ -11,7 +11,7 @@ #include #include -#include "../DataDesc/datadesc_interface.h" +#include "../src/gras/DataDesc/datadesc_interface.h" GRAS_LOG_NEW_DEFAULT_CATEGORY(test); #define READ 0 diff --git a/testsuite/gras/trp_file_client.c b/testsuite/gras/trp_file_client.c index b3cb066cc7..3488145a6f 100644 --- a/testsuite/gras/trp_file_client.c +++ b/testsuite/gras/trp_file_client.c @@ -10,7 +10,7 @@ #include #include -#include "../Transport/transport_interface.h" +#include "../gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); diff --git a/testsuite/gras/trp_file_server.c b/testsuite/gras/trp_file_server.c index 4bff8ed3a0..75386420d4 100644 --- a/testsuite/gras/trp_file_server.c +++ b/testsuite/gras/trp_file_server.c @@ -10,7 +10,7 @@ #include #include -#include "../Transport/transport_interface.h" +#include "../gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); diff --git a/testsuite/gras/trp_tcp_client.c b/testsuite/gras/trp_tcp_client.c index 5eb465f39f..6012a1c4b4 100644 --- a/testsuite/gras/trp_tcp_client.c +++ b/testsuite/gras/trp_tcp_client.c @@ -10,7 +10,7 @@ #include #include -#include "../Transport/transport_interface.h" +#include "../src/gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); diff --git a/testsuite/gras/trp_tcp_server.c b/testsuite/gras/trp_tcp_server.c index e8c0ee7f06..4e0e1fcc66 100644 --- a/testsuite/gras/trp_tcp_server.c +++ b/testsuite/gras/trp_tcp_server.c @@ -10,7 +10,7 @@ #include #include -#include "../Transport/transport_interface.h" +#include "../src/gras/Transport/transport_interface.h" //GRAS_LOG_NEW_DEFAULT_CATEGORY(test); -- 2.20.1