platform file is not hardcoded anymore

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@687 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 1ad5a6c..dc9c2d8 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -30,7 +30,7 @@ RL_tests =                                              \
 
 SG_tests =                                              \
        surf/maxmin_usage surf/maxmin_bench \
 
 SG_tests =                                              \
        surf/maxmin_usage surf/maxmin_bench \

-       surf/trace_usage surf/surf_usage
+       surf/trace_usage surf/surf_usage surf/surf_usage2

 
 check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage
 
 check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
 check_SCRIPTS = run_tests gras/trp_tcp_usage


@@ -66,6 +66,7 @@ surf_maxmin_usage_LDADD=      $(LDADD_UTILS)
 surf_maxmin_bench_LDADD=      $(LDADD_UTILS)
 surf_trace_usage_LDADD=       $(LDADD_UTILS)
 surf_surf_usage_LDADD=        $(LDADD_UTILS)
 surf_maxmin_bench_LDADD=      $(LDADD_UTILS)
 surf_trace_usage_LDADD=       $(LDADD_UTILS)
 surf_surf_usage_LDADD=        $(LDADD_UTILS)

+surf_surf_usage2_LDADD=       $(LDADD_UTILS)

 
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)
 
 gras_trp_tcp_client_LDADD=     $(LDADD_RL)
 gras_trp_tcp_server_LDADD=     $(LDADD_RL)

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index f81b98c..8588a81 100755 (executable)
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -29,7 +29,7 @@ for test in xbt/log_usage@EXEEXT@                                 \
            \
            surf/maxmin_usage@EXEEXT@       surf/maxmin_bench@EXEEXT@               \
            surf/trace_usage@EXEEXT@                                        \
            \
            surf/maxmin_usage@EXEEXT@       surf/maxmin_bench@EXEEXT@               \
            surf/trace_usage@EXEEXT@                                        \

-           surf/surf_usage@EXEEXT@                                         
+           "surf/surf_usage@EXEEXT@ platform.txt" "surf/surf_usage2@EXEEXT@ platform.txt"                                        

 do                 
   tests_nb=`expr $tests_nb + 1`
   echo "#### Test $test"
 do                 
   tests_nb=`expr $tests_nb + 1`
   echo "#### Test $test"

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index 0577f21..c7d4a2b 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -30,8 +30,8 @@ const char *string_action(e_surf_action_state_t state)
 }
 
 
 }
 
 

-void test(void);
-void test(void)
+void test(char *platform);
+void test(char *platform)

 {
   void *cpuA = NULL;
   void *cpuB = NULL;
 {
   void *cpuA = NULL;
   void *cpuB = NULL;


@@ -46,8 +46,8 @@ void test(void)
   e_surf_action_state_t stateActionC;
   double now = -1.0;
 
   e_surf_action_state_t stateActionC;
   double now = -1.0;
 

-  surf_cpu_resource_init("platform.txt");      /* Now it is possible to use CPUs */
-  surf_network_resource_init("platform.txt");  /* Now it is possible to use eth0 */
+  surf_cpu_resource_init(platform);    /* Now it is possible to use CPUs */
+  surf_network_resource_init(platform);        /* Now it is possible to use eth0 */

 
   /*********************** CPU ***********************************/
   printf("%p \n", surf_cpu_resource);
 
   /*********************** CPU ***********************************/
   printf("%p \n", surf_cpu_resource);


@@ -132,10 +132,13 @@ void test(void)
   surf_finalize();
 }
 
   surf_finalize();
 }
 

-

 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);      /* Initialize some common structures */
 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);      /* Initialize some common structures */

-  test();
+  if(argc==1) {
+     fprintf(stderr,"Usage : %s platform.txt\n",argv[0]);
+     return 1;
+  }
+  test(argv[1]);

   return 0;
 }
   return 0;
 }

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 66c09fe..7c6c05d 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -30,8 +30,8 @@ const char *string_action(e_surf_action_state_t state)
 }
 
 
 }
 
 

-void test(void);
-void test(void)
+void test(char *platform);
+void test(char *platform)

 {
   void *workstationA = NULL;
   void *workstationB = NULL;
 {
   void *workstationA = NULL;
   void *workstationB = NULL;


@@ -44,7 +44,7 @@ void test(void)
   e_surf_action_state_t stateActionC;
   double now = -1.0;
 
   e_surf_action_state_t stateActionC;
   double now = -1.0;
 

-  surf_workstation_resource_init("platform.txt");
+  surf_workstation_resource_init(platform);

 
   /*********************** WORKSTATION ***********************************/
   workstationA =
 
   /*********************** WORKSTATION ***********************************/
   workstationA =


@@ -106,10 +106,13 @@ void test(void)
   surf_finalize();
 }
 
   surf_finalize();
 }
 

-

 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);      /* Initialize some common structures */
 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);      /* Initialize some common structures */

-  test();
+  if(argc==1) {
+     fprintf(stderr,"Usage : %s platform.txt\n",argv[0]);
+     return 1;
+  }
+  test(argv[1]);

   return 0;
 }
   return 0;
 }