Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
remove tests that are redundant with examples/cpp/*-dependent
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 22 Feb 2021 08:19:53 +0000 (09:19 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 22 Feb 2021 13:09:40 +0000 (14:09 +0100)
MANIFEST.in
teshsuite/simdag/CMakeLists.txt
teshsuite/simdag/basic3/basic3.c [deleted file]
teshsuite/simdag/basic3/basic3.tesh [deleted file]
teshsuite/simdag/basic4/basic4.c [deleted file]
teshsuite/simdag/basic4/basic4.tesh [deleted file]

index a8957c6..a0059d4 100644 (file)
@@ -760,10 +760,6 @@ include teshsuite/simdag/availability/availability.c
 include teshsuite/simdag/availability/availability.tesh
 include teshsuite/simdag/basic1/basic1.c
 include teshsuite/simdag/basic1/basic1.tesh
-include teshsuite/simdag/basic3/basic3.c
-include teshsuite/simdag/basic3/basic3.tesh
-include teshsuite/simdag/basic4/basic4.c
-include teshsuite/simdag/basic4/basic4.tesh
 include teshsuite/simdag/flatifier/bogus_missing_gateway.tesh
 include teshsuite/simdag/flatifier/bogus_two_hosts_asymetric.tesh
 include teshsuite/simdag/flatifier/flatifier.cpp
index e04e89a..3e9b43b 100644 (file)
@@ -1,4 +1,4 @@
-foreach(x availability basic1 basic3 basic4 incomplete)
+foreach(x availability basic1 incomplete)
   add_executable       (${x}  EXCLUDE_FROM_ALL ${x}/${x}.c)
   target_link_libraries(${x}  simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -50,7 +50,7 @@ set(txt_files     ${txt_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/carol.
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.fail
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link.lat                         PARENT_SCOPE)
 
-foreach(x availability basic1 basic3 basic4 flatifier incomplete)
+foreach(x availability basic1 flatifier incomplete)
   ADD_TESH(tesh-simdag-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/${x} ${x}.tesh)
 endforeach()
 
diff --git a/teshsuite/simdag/basic3/basic3.c b/teshsuite/simdag/basic3/basic3.c
deleted file mode 100644 (file)
index 7c5bcdd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (c) 2007-2021. The SimGrid Team.
- * All rights reserved.                                                     */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#include "simgrid/simdag.h"
-#include "xbt/log.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic3, sd, "SimDag test basic3");
-
-/* Basic SimDag Test 3
- * Scenario:
- *   - Create a chain of tasks (Init, A, Fin)
- * Verify that the tasks are actually simulated in the right order.
- */
-int main(int argc, char **argv)
-{
-  /* scheduling parameters */
-  double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
-
-  /* initialization of SD */
-  SD_init(&argc, argv);
-
-  /* creation of the environment */
-  SD_create_environment(argv[1]);
-
-  /* creation of the tasks and their dependencies */
-  SD_task_t taskInit = SD_task_create("Task Init", NULL, 1.0);
-  SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
-  SD_task_t taskFin = SD_task_create("Task Fin", NULL, 1.0);
-
-  SD_task_dependency_add(taskInit, taskA);
-  SD_task_dependency_add(taskA, taskFin);
-
-  sg_host_t *hosts = sg_host_list();
-  SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0);
-  SD_task_schedule(taskA, 2, hosts, no_cost, no_cost, -1.0);
-  SD_task_schedule(taskFin, 1, hosts, no_cost, no_cost, -1.0);
-  xbt_free(hosts);
-
-  /* let's launch the simulation! */
-  SD_simulate(-1.0);
-  SD_task_destroy(taskInit);
-  SD_task_destroy(taskA);
-  SD_task_destroy(taskFin);
-
-  XBT_INFO("Simulation time: %f", SD_get_clock());
-
-  return 0;
-}
diff --git a/teshsuite/simdag/basic3/basic3.tesh b/teshsuite/simdag/basic3/basic3.tesh
deleted file mode 100644 (file)
index 1039ecd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-$ ${bindir:=.}/basic3 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd.thresh:verbose
-> [  0.000000] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] Starting simulation...
-> [  0.000000] Run simulation for -1.000000 seconds
-> [  0.000000] Executing task 'Task Init'
-> [  0.000000] Task 'Task Init' done
-> [  0.000000] Executing task 'Task A'
-> [  0.000000] Task 'Task A' done
-> [  0.000000] Executing task 'Task Fin'
-> [  0.000000] Task 'Task Fin' done
-> [  0.000000] Simulation time: 0.000000
diff --git a/teshsuite/simdag/basic4/basic4.c b/teshsuite/simdag/basic4/basic4.c
deleted file mode 100644 (file)
index c3f8b1c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (c) 2007-2021. The SimGrid Team.
- * All rights reserved.                                                     */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#include "simgrid/simdag.h"
-#include "xbt/log.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic4, sd, "SimDag test basic4");
-
-/* Basic SimDag Test 4
- * Scenario:
- *   - Create a chain of tasks (Init, A, Fin)
- *   - Have a 1B communication between two no-op tasks.
- * Verify that the tasks are actually simulated in the right order.
- * The simulated time should be equal to the network latency: 0.0001 seconds.
- */
-int main(int argc, char **argv)
-{
-  /* scheduling parameters */
-  double no_cost[] = { 0., 0., 0., 0. };
-  double amount[] = { 0., 1., 0., 0. };
-
-  /* SD initialization */
-  SD_init(&argc, argv);
-
-  /* creation of the environment */
-  SD_create_environment(argv[1]);
-
-  /* creation of the tasks and their dependencies */
-  SD_task_t taskInit = SD_task_create("Task Init", NULL, 1.0);
-  SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
-  SD_task_t taskFin = SD_task_create("Task Fin", NULL, 1.0);
-
-  SD_task_dependency_add(taskInit, taskA);
-  SD_task_dependency_add(taskA, taskFin);
-
-  sg_host_t *hosts = sg_host_list();
-  SD_task_schedule(taskInit, 1, hosts, no_cost, no_cost, -1.0);
-  SD_task_schedule(taskA, 2, hosts, no_cost, amount, -1.0);
-  SD_task_schedule(taskFin, 1, hosts, no_cost, no_cost, -1.0);
-  xbt_free(hosts);
-
-  /* let's launch the simulation! */
-  SD_simulate(-1.0);
-  SD_task_destroy(taskInit);
-  SD_task_destroy(taskA);
-  SD_task_destroy(taskFin);
-
-  XBT_INFO("Simulation time: %f", SD_get_clock());
-
-  return 0;
-}
diff --git a/teshsuite/simdag/basic4/basic4.tesh b/teshsuite/simdag/basic4/basic4.tesh
deleted file mode 100644 (file)
index 9bf1889..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-$ ${bindir:=.}/basic4 ../../../examples/platforms/two_hosts_platform_shared.xml "--log=root.fmt:[%10.6r]%e%m%n" --log=sd.thresh:verbose
-> [  0.000000] Switching to the L07 model to handle parallel tasks.
-> [  0.000000] Starting simulation...
-> [  0.000000] Run simulation for -1.000000 seconds
-> [  0.000000] Executing task 'Task Init'
-> [  0.000000] Task 'Task Init' done
-> [  0.000000] Executing task 'Task A'
-> [  0.000100] Task 'Task A' done
-> [  0.000100] Executing task 'Task Fin'
-> [  0.000100] Task 'Task Fin' done
-> [  0.000100] Simulation time: 0.000100