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
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)
\
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"
}
-void test(void);
-void test(void)
+void test(char *platform);
+void test(char *platform)
{
void *cpuA = NULL;
void *cpuB = NULL;
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);
surf_finalize();
}
-
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;
}
}
-void test(void);
-void test(void)
+void test(char *platform);
+void test(char *platform)
{
void *workstationA = NULL;
void *workstationB = NULL;
e_surf_action_state_t stateActionC;
double now = -1.0;
- surf_workstation_resource_init("platform.txt");
+ surf_workstation_resource_init(platform);
/*********************** WORKSTATION ***********************************/
workstationA =
surf_finalize();
}
-
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;
}