From 68880b8ce3ff9ade9d9a872db8fa5cdfdff2c2b4 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 10 Jul 2019 00:36:27 +0200 Subject: [PATCH] Fix duplicated entries. --- MANIFEST.in | 29 ------------------- examples/s4u/CMakeLists.txt | 1 - teshsuite/java/CMakeLists.txt | 2 +- teshsuite/s4u/CMakeLists.txt | 4 --- teshsuite/smpi/isp/umpire/CMakeLists.txt | 2 -- .../smpi/mpich3-test/comm/CMakeLists.txt | 2 +- tools/cmake/DefinePackages.cmake | 3 +- tools/cmake/Distrib.cmake | 1 + 8 files changed, 5 insertions(+), 39 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index c8f1138965..516d08fbdf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -320,7 +320,6 @@ include examples/s4u/async-ready/s4u-async-ready_d.xml include examples/s4u/async-wait/s4u-async-wait.cpp include examples/s4u/async-wait/s4u-async-wait.tesh include examples/s4u/async-wait/s4u-async-wait_d.xml -include examples/s4u/async-wait/s4u-async-wait_d.xml include examples/s4u/async-waitall/s4u-async-waitall.cpp include examples/s4u/async-waitall/s4u-async-waitall.tesh include examples/s4u/async-waitall/s4u-async-waitall_d.xml @@ -549,7 +548,6 @@ include examples/smpi/trace_simple/trace_simple.tesh include teshsuite/java/semaphoregc/SemaphoreGC.java include teshsuite/java/semaphoregc/semaphoregc.tesh include teshsuite/java/sleephostoff/SleepHostOff.java -include teshsuite/java/sleephostoff/SleepHostOff.java include teshsuite/java/sleephostoff/sleephostoff.tesh include teshsuite/mc/dwarf-expression/dwarf-expression.cpp include teshsuite/mc/dwarf-expression/dwarf-expression.tesh @@ -686,7 +684,6 @@ include teshsuite/s4u/activity-lifecycle/activity-lifecycle.tesh include teshsuite/s4u/activity-lifecycle/testing_platform.xml include teshsuite/s4u/actor-autorestart/actor-autorestart.cpp include teshsuite/s4u/actor-autorestart/actor-autorestart.tesh -include teshsuite/s4u/actor-autorestart/actor-autorestart.tesh include teshsuite/s4u/actor-migration/actor-migration.cpp include teshsuite/s4u/actor-migration/actor-migration.tesh include teshsuite/s4u/actor/actor.cpp @@ -886,8 +883,6 @@ include teshsuite/smpi/isp/umpire/collective-exhaustive-byte-int-mismatch.c include teshsuite/smpi/isp/umpire/collective-exhaustive-no-error.c include teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c include teshsuite/smpi/isp/umpire/collective-misorder.c -include teshsuite/smpi/isp/umpire/collective-misorder.c -include teshsuite/smpi/isp/umpire/collective-misorder2.c include teshsuite/smpi/isp/umpire/collective-misorder2.c include teshsuite/smpi/isp/umpire/comm-bcast-deadlock.c include teshsuite/smpi/isp/umpire/comm-deadlock.c @@ -1123,16 +1118,13 @@ include teshsuite/smpi/mpich3-test/comm/comm_create_group_idup.c include teshsuite/smpi/mpich3-test/comm/comm_group_half.c include teshsuite/smpi/mpich3-test/comm/comm_group_rand.c include teshsuite/smpi/mpich3-test/comm/comm_idup.c -include teshsuite/smpi/mpich3-test/comm/comm_idup.c include teshsuite/smpi/mpich3-test/comm/comm_idup_comm.c include teshsuite/smpi/mpich3-test/comm/comm_idup_comm2.c include teshsuite/smpi/mpich3-test/comm/comm_idup_iallreduce.c include teshsuite/smpi/mpich3-test/comm/comm_idup_isend.c include teshsuite/smpi/mpich3-test/comm/comm_idup_mul.c -include teshsuite/smpi/mpich3-test/comm/comm_idup_mul.c include teshsuite/smpi/mpich3-test/comm/comm_idup_nb.c include teshsuite/smpi/mpich3-test/comm/comm_idup_overlap.c -include teshsuite/smpi/mpich3-test/comm/comm_idup_overlap.c include teshsuite/smpi/mpich3-test/comm/comm_info.c include teshsuite/smpi/mpich3-test/comm/commcreate1.c include teshsuite/smpi/mpich3-test/comm/commname.c @@ -1285,7 +1277,6 @@ include teshsuite/smpi/mpich3-test/f77/rma/baseattrwinf.f include teshsuite/smpi/mpich3-test/f77/rma/c2f2cwin.c include teshsuite/smpi/mpich3-test/f77/rma/c2f2cwinf.f include teshsuite/smpi/mpich3-test/f77/rma/testlist -include teshsuite/smpi/mpich3-test/f77/rma/testlist include teshsuite/smpi/mpich3-test/f77/rma/winaccf.f include teshsuite/smpi/mpich3-test/f77/rma/winattr2f.f include teshsuite/smpi/mpich3-test/f77/rma/winattrf.f @@ -1352,7 +1343,6 @@ include teshsuite/smpi/mpich3-test/f90/rma/baseattrwinf90.f90 include teshsuite/smpi/mpich3-test/f90/rma/c2f2cwinf90.f90 include teshsuite/smpi/mpich3-test/f90/rma/c2f902cwin.c include teshsuite/smpi/mpich3-test/f90/rma/testlist -include teshsuite/smpi/mpich3-test/f90/rma/testlist include teshsuite/smpi/mpich3-test/f90/rma/winaccf90.f90 include teshsuite/smpi/mpich3-test/f90/rma/winattr2f90.f90 include teshsuite/smpi/mpich3-test/f90/rma/winattrf90.f90 @@ -1366,7 +1356,6 @@ include teshsuite/smpi/mpich3-test/f90/rma/winscale2f90.f90 include teshsuite/smpi/mpich3-test/f90/testlist include teshsuite/smpi/mpich3-test/f90/util/../util/mtestf90.f90 include teshsuite/smpi/mpich3-test/generate_report -include teshsuite/smpi/mpich3-test/generate_report include teshsuite/smpi/mpich3-test/group/glpid.c include teshsuite/smpi/mpich3-test/group/groupcreate.c include teshsuite/smpi/mpich3-test/group/groupnullincl.c @@ -1379,7 +1368,6 @@ include teshsuite/smpi/mpich3-test/hostfile include teshsuite/smpi/mpich3-test/include/dtypes.h include teshsuite/smpi/mpich3-test/include/mpicolltest.h include teshsuite/smpi/mpich3-test/include/mpitest.h -include teshsuite/smpi/mpich3-test/include/mpitest.h include teshsuite/smpi/mpich3-test/include/mpitestconf.h include teshsuite/smpi/mpich3-test/include/mpitestcxx.h include teshsuite/smpi/mpich3-test/include/mpithreadtest.h @@ -1914,12 +1902,8 @@ include include/simgrid/forward.h include include/simgrid/host.h include include/simgrid/instr.h include include/simgrid/jedule/jedule.hpp -include include/simgrid/jedule/jedule.hpp -include include/simgrid/jedule/jedule_events.hpp include include/simgrid/jedule/jedule_events.hpp include include/simgrid/jedule/jedule_platform.hpp -include include/simgrid/jedule/jedule_platform.hpp -include include/simgrid/jedule/jedule_sd_binding.h include include/simgrid/jedule/jedule_sd_binding.h include include/simgrid/kernel/future.hpp include include/simgrid/kernel/resource/Action.hpp @@ -2074,15 +2058,11 @@ include src/bindings/java/org/simgrid/msg/TransferFailureException.java include src/bindings/java/org/simgrid/msg/VM.java include src/bindings/java/org/simgrid/trace/Trace.java include src/bindings/lua/lua_host.cpp -include src/bindings/lua/lua_host.cpp -include src/bindings/lua/lua_platf.cpp include src/bindings/lua/lua_platf.cpp include src/bindings/lua/lua_private.hpp include src/bindings/lua/lua_utils.cpp -include src/bindings/lua/lua_utils.cpp include src/bindings/lua/lua_utils.hpp include src/bindings/lua/simgrid_lua.cpp -include src/bindings/lua/simgrid_lua.cpp include src/bindings/lua/simgrid_lua.hpp include src/bindings/python/simgrid_python.cpp include src/include/catch.hpp @@ -2110,12 +2090,8 @@ include src/instr/instr_private.hpp include src/instr/instr_resource_utilization.cpp include src/instr/instr_smpi.hpp include src/instr/jedule/jedule.cpp -include src/instr/jedule/jedule.cpp -include src/instr/jedule/jedule_events.cpp include src/instr/jedule/jedule_events.cpp include src/instr/jedule/jedule_platform.cpp -include src/instr/jedule/jedule_platform.cpp -include src/instr/jedule/jedule_sd_binding.cpp include src/instr/jedule/jedule_sd_binding.cpp include src/internal_config.h.in include src/kernel/EngineImpl.cpp @@ -2236,8 +2212,6 @@ include src/mc/mc_memory.cpp include src/mc/mc_mmu.hpp include src/mc/mc_private.hpp include src/mc/mc_record.cpp -include src/mc/mc_record.cpp -include src/mc/mc_record.hpp include src/mc/mc_record.hpp include src/mc/mc_replay.hpp include src/mc/mc_request.cpp @@ -2280,7 +2254,6 @@ include src/plugins/host_load.cpp include src/plugins/link_energy.cpp include src/plugins/vm/VirtualMachineImpl.cpp include src/plugins/vm/VirtualMachineImpl.hpp -include src/plugins/vm/VirtualMachineImpl.hpp include src/plugins/vm/VmHostExt.cpp include src/plugins/vm/VmHostExt.hpp include src/plugins/vm/VmLiveMigration.cpp @@ -2319,7 +2292,6 @@ include src/simix/popping_accessors.hpp include src/simix/popping_bodies.cpp include src/simix/popping_enum.h include src/simix/popping_generated.cpp -include src/simix/popping_generated.cpp include src/simix/popping_private.hpp include src/simix/simcalls.in include src/simix/simcalls.py @@ -2554,7 +2526,6 @@ include src/surf/xml/simgrid_dtd.c include src/surf/xml/simgrid_dtd.h include src/surf/xml/surfxml_parseplatf.cpp include src/surf/xml/surfxml_sax_cb.cpp -include src/surf/xml/surfxml_sax_cb.cpp include src/xbt/OsSemaphore.hpp include src/xbt/RngStream.c include src/xbt/automaton/automaton.c diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index e387d8ce6a..e6d1930592 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -171,7 +171,6 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-a ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall_d.xml - ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-ready/s4u-async-ready_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-waituntil/s4u-async-waituntil_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord_d.xml diff --git a/teshsuite/java/CMakeLists.txt b/teshsuite/java/CMakeLists.txt index 76c248efc9..523105a12c 100644 --- a/teshsuite/java/CMakeLists.txt +++ b/teshsuite/java/CMakeLists.txt @@ -24,7 +24,7 @@ foreach(example semaphoregc sleephostoff) set(examples_src ${examples_src} ${sources}) endforeach() -set(examples_src ${examples_src} ${sources} PARENT_SCOPE) +set(examples_src ${examples_src} PARENT_SCOPE) set(tesh_files ${tesh_files} PARENT_SCOPE) if(enable_java) diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt index a93c8f9364..029dafd8ab 100644 --- a/teshsuite/s4u/CMakeLists.txt +++ b/teshsuite/s4u/CMakeLists.txt @@ -20,10 +20,6 @@ foreach(x actor actor-autorestart actor-migration ADD_TESH_FACTORIES(tesh-s4u-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} ${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x}/${x}.tesh) endforeach() -# Manually add this file, but the test is broken and must be disabled for now (TODO) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-autorestart/actor-autorestart.tesh) - - foreach(x listen_async pid storage_client_server cloud-sharing) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) ADD_TESH(tesh-s4u-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/teshsuite/s4u/${x} ${CMAKE_HOME_DIRECTORY}/teshsuite/s4u/${x}/${x}.tesh) diff --git a/teshsuite/smpi/isp/umpire/CMakeLists.txt b/teshsuite/smpi/isp/umpire/CMakeLists.txt index 5dc3cd1e47..1798dab2c3 100644 --- a/teshsuite/smpi/isp/umpire/CMakeLists.txt +++ b/teshsuite/smpi/isp/umpire/CMakeLists.txt @@ -110,8 +110,6 @@ set(umpire_src_other change-send-buffer-type-exhaustive.c collective-exhaustive-byte-int-mismatch.c collective-exhaustive-no-error.c - collective-misorder.c - collective-misorder2.c deadlock-config_blocking.c errhandler-no-error.c diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt index 062941a4b3..e075b3f288 100644 --- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt @@ -25,7 +25,7 @@ if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) endif() foreach(file cmfree cmsplit2 cmsplit cmsplit_type commcreate1 comm_create_group comm_group_half comm_group_rand - comm_idup comm_idup_overlap comm_idup_mul comm_info commname ctxalloc ctxsplit dup dupic dup_with_info ic1 ic2 + comm_info commname ctxalloc ctxsplit dup dupic dup_with_info ic1 ic2 iccreate icgroup icm icsplit probe-intercomm comm_create_group_idup comm_idup_comm comm_idup_mul comm_idup comm_idup_iallreduce comm_idup_nb comm_idup_comm2 comm_idup_isend comm_idup_overlap ) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c) diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 143ca4be77..f208d945b5 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -66,7 +66,6 @@ set(EXTRA_DIST src/xbt/mallocator_private.h src/xbt/mmalloc/mfree.c - src/xbt/mmalloc/mm.c src/xbt/mmalloc/mm_legacy.c src/xbt/mmalloc/mm_module.c src/xbt/mmalloc/mmalloc.c @@ -297,6 +296,8 @@ set(XBT_SRC if(HAVE_MMALLOC) set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c ) +else() + set(EXTRA_DIST ${EXTRA_DIST} src/xbt/mmalloc/mm.c) endif() set(NS3_SRC src/surf/network_ns3.cpp diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index bbf1d0aba5..4948b39853 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -182,6 +182,7 @@ set(source_to_pack ${xml_files} ) list(SORT source_to_pack) +list(REMOVE_DUPLICATES source_to_pack) ########################################## ### Fill in the "make dist-dir" target ### -- 2.20.1