From 1f5491cf07822f077c2efaaca576badc8ef5bde1 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 21 May 2008 09:46:39 +0000 Subject: [PATCH] Do not use NULL as a name since AIX and linux do not display them the same way (AIX->"";Linux->"(null)") git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5482 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- teshsuite/simdag/basic1.c | 2 +- teshsuite/simdag/basic1.tesh | 4 ++-- teshsuite/simdag/basic2.c | 2 +- teshsuite/simdag/basic2.tesh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/teshsuite/simdag/basic1.c b/teshsuite/simdag/basic1.c index 065254732a..48a5ef15d7 100644 --- a/teshsuite/simdag/basic1.c +++ b/teshsuite/simdag/basic1.c @@ -10,7 +10,7 @@ int main(int argc, char **argv) { SD_create_environment(argv[1]); /* creation of the tasks and their dependencies */ - SD_task_t taskInit = SD_task_create(NULL,NULL,1.0); + SD_task_t taskInit = SD_task_create("Init",NULL,1.0); SD_task_t taskA = SD_task_create("Task Comm A", NULL, 1.0); SD_task_t taskB = SD_task_create("Task Comm B", NULL, 1.0); diff --git a/teshsuite/simdag/basic1.tesh b/teshsuite/simdag/basic1.tesh index 2fb7378582..3eb98cdfb7 100644 --- a/teshsuite/simdag/basic1.tesh +++ b/teshsuite/simdag/basic1.tesh @@ -1,7 +1,7 @@ $ simdag/basic1 simdag/basic_platform.xml > [0.000000] [sd_kernel/INFO] Starting simulation... -> [0.000000] [sd_kernel/INFO] Executing task '(null)' -> [0.000000] [sd_kernel/INFO] Task '(null)' done +> [0.000000] [sd_kernel/INFO] Executing task 'Init' +> [0.000000] [sd_kernel/INFO] Task 'Init' done > [0.000000] [sd_kernel/INFO] Executing task 'Task Comm A' > [0.000000] [sd_kernel/INFO] Executing task 'Task Comm B' > [16.000100] [sd_kernel/INFO] Task 'Task Comm A' done diff --git a/teshsuite/simdag/basic2.c b/teshsuite/simdag/basic2.c index adb67bfbf5..b823b88fcb 100644 --- a/teshsuite/simdag/basic2.c +++ b/teshsuite/simdag/basic2.c @@ -10,7 +10,7 @@ int main(int argc, char **argv) { SD_create_environment(argv[1]); /* creation of the tasks and their dependencies */ - SD_task_t taskInit = SD_task_create(NULL,NULL,1.0); + SD_task_t taskInit = SD_task_create("Init",NULL,1.0); SD_task_t taskA = SD_task_create("Task Comm A", NULL, 1.0); SD_task_t taskB = SD_task_create("Task Comm B", NULL, 1.0); diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh index 778afe362f..d9cb860b0c 100644 --- a/teshsuite/simdag/basic2.tesh +++ b/teshsuite/simdag/basic2.tesh @@ -1,7 +1,7 @@ $ simdag/basic2 simdag/basic_platform.xml > [0.000000] [sd_kernel/INFO] Starting simulation... -> [0.000000] [sd_kernel/INFO] Executing task '(null)' -> [0.000000] [sd_kernel/INFO] Task '(null)' done +> [0.000000] [sd_kernel/INFO] Executing task 'Init' +> [0.000000] [sd_kernel/INFO] Task 'Init' done > [0.000000] [sd_kernel/INFO] Executing task 'Task Comm A' > [0.000000] [sd_kernel/INFO] Executing task 'Task Comm B' > [1.600100] [sd_kernel/INFO] Task 'Task Comm B' done -- 2.20.1