From b7fb4f729e2b4446f3af5b9115c16909973cc355 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 15 Jan 2016 13:45:04 +0100 Subject: [PATCH] remove free of return set in user code for these tests too. --- teshsuite/simdag/incomplete/incomplete.c | 4 +--- .../simdag/network/mxn/test_intra_scatter.c | 4 +--- teshsuite/simdag/network/test_reinit_costs.c | 20 ++++++------------- teshsuite/simdag/partask/test_comp_only_par.c | 4 +--- teshsuite/simdag/partask/test_comp_only_seq.c | 4 +--- 5 files changed, 10 insertions(+), 26 deletions(-) diff --git a/teshsuite/simdag/incomplete/incomplete.c b/teshsuite/simdag/incomplete/incomplete.c index 1d65c087d8..4f25f389e5 100644 --- a/teshsuite/simdag/incomplete/incomplete.c +++ b/teshsuite/simdag/incomplete/incomplete.c @@ -26,7 +26,6 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA, taskB, taskC, taskD; - xbt_dynar_t ret; const SD_workstation_t *workstation; @@ -64,8 +63,7 @@ int main(int argc, char **argv) &communication_amount1, -1.0); - ret = SD_simulate(-1.); - xbt_dynar_free(&ret); + SD_simulate(-1.); SD_task_destroy(taskA); SD_task_destroy(taskB); SD_task_destroy(taskC); diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.c b/teshsuite/simdag/network/mxn/test_intra_scatter.c index 318cea382e..5b28563e65 100644 --- a/teshsuite/simdag/network/mxn/test_intra_scatter.c +++ b/teshsuite/simdag/network/mxn/test_intra_scatter.c @@ -26,7 +26,6 @@ int main(int argc, char **argv) { double time; SD_task_t task; - xbt_dynar_t ret; double communication_amount[] = { 0.0, 1.0, 2.0, 3.0, 0.0, 0.0, 0.0, 0.0, @@ -47,8 +46,7 @@ int main(int argc, char **argv) SD_task_schedule(task, 4, SD_workstation_get_list(), no_cost, communication_amount, -1.0); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); diff --git a/teshsuite/simdag/network/test_reinit_costs.c b/teshsuite/simdag/network/test_reinit_costs.c index bc73a2a827..584bd62c73 100644 --- a/teshsuite/simdag/network/test_reinit_costs.c +++ b/teshsuite/simdag/network/test_reinit_costs.c @@ -38,25 +38,21 @@ static void zero_cost_test(int *argc, char *argv[]) { double time; SD_task_t task; - xbt_dynar_t ret; SD_init(argc, argv); SD_create_environment(argv[1]); task = create_empty_cost_root(); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(task); SD_application_reinit(); task = create_empty_cost_root(); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(task); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); printf("%g\n", time); @@ -82,25 +78,21 @@ static void zero_cost_test2(int *argc, char *argv[]) { double time; SD_task_t task; - xbt_dynar_t ret; SD_init(argc, argv); SD_create_environment(argv[1]); task = create_root_with_costs(); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(task); SD_application_reinit(); task = create_empty_cost_root(); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(task); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); printf("%g\n", time); diff --git a/teshsuite/simdag/partask/test_comp_only_par.c b/teshsuite/simdag/partask/test_comp_only_par.c index ddae4693ab..53b823ffb7 100644 --- a/teshsuite/simdag/partask/test_comp_only_par.c +++ b/teshsuite/simdag/partask/test_comp_only_par.c @@ -17,7 +17,6 @@ int main(int argc, char **argv) double comp_cost[] = { 1.0, 1.0 }; SD_task_t task; - xbt_dynar_t ret; SD_init(&argc, argv); SD_create_environment(argv[1]); @@ -26,8 +25,7 @@ int main(int argc, char **argv) SD_task_schedule(task, 2, SD_workstation_get_list(), comp_cost, comm_amount, -1.0); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); diff --git a/teshsuite/simdag/partask/test_comp_only_seq.c b/teshsuite/simdag/partask/test_comp_only_seq.c index 3b22157e58..875db675cc 100644 --- a/teshsuite/simdag/partask/test_comp_only_seq.c +++ b/teshsuite/simdag/partask/test_comp_only_seq.c @@ -17,7 +17,6 @@ int main(int argc, char **argv) double comp_cost[] = { 1.0 }; SD_task_t task; - xbt_dynar_t ret; SD_init(&argc, argv); SD_create_environment(argv[1]); @@ -26,8 +25,7 @@ int main(int argc, char **argv) SD_task_schedule(task, 1, SD_workstation_get_list(), comp_cost, comm_amount, -1.0); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock(); -- 2.20.1