From: navarrop Date: Thu, 11 Mar 2010 15:04:02 +0000 (+0000) Subject: Refresh directories. X-Git-Tag: SVN~516 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5388ef6910cafc858fc38edcbee0566c07ea5ed1 Refresh directories. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7223 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/CMakeLists.txt b/buildtools/Cmake/CMakeLists.txt deleted file mode 100644 index f6d54cf519..0000000000 --- a/buildtools/Cmake/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -PROJECT(SimgridProject) - -# --------------------- OPTIONS OF THE PROJECT ----------------------------- -OPTION( BUILD_SHARED_LIBS "Build SimGrid with shared libraries." ON ) -OPTION( SIMGRID_BUILD_EXAMPLES "Build SimGrid examples." ON ) -OPTION( SIMGRID_BUILD_DOCUMENTATION "Build the users manual documentation." OFF ) -OPTION( SIMGRID_WITH_PTHREAD "Use pthread as context support." OFF ) - -OPTION( SIMGRID_USE_GTNETS "Build SimGrid with GTNets support." OFF ) - -### Display the version -find_program(CAT NAMES cat) -exec_program("${CAT}" ARGS "version" OUTPUT_VARIABLE VERSION) -message("svn version: " ${VERSION}) - - -### Check 32bits or 64bits -INCLUDE (CheckTypeSize) -CHECK_TYPE_SIZE("long" SIZEOF_LONG) -IF(SIZEOF_LONG EQUAL 4) - SET(ARCH_32_BITS 1) -ELSE(SIZEOF_LONG EQUAL 4) - SET(ARCH_32_BITS 0) -ENDIF(SIZEOF_LONG EQUAL 4) - - -### Enable tests -INCLUDE(CTestConfig.cmake) -ENABLE_TESTING() -INCLUDE(CTest) -INCLUDE(Dart) -INCLUDE(CTestList.txt) - -# Install the CTest configuration in the build dir -configure_file(CTestConfig.cmake ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY) - -#SET (CMAKE_COMPILER_IS_GNUCXX 1) -#SET (CMAKE_COMPILER_IS_GNUCC 1) - diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake deleted file mode 100644 index 45ab81c1f2..0000000000 --- a/buildtools/Cmake/CTestConfig.cmake +++ /dev/null @@ -1,50 +0,0 @@ -# Configure CTest. For details, see: -# http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest - -SET (UPDATE_TYPE "svn") -SET (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000") -SET (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000") - -#Get the hostname of current machine : -find_program(HOSTNAME_CMD NAMES hostname) -exec_program(${HOSTNAME_CMD} OUTPUT_VARIABLE HOSTNAME) -set(SITE "${HOSTNAME}") -MARK_AS_ADVANCED(HOSTNAME_CMD) - -#Get the system information of current machine -find_program(UNAME NAMES uname) -macro(getuname name flag) -exec_program("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}") -endmacro(getuname) -MARK_AS_ADVANCED(UNAME) - -find_program(CAT NAMES cat) -exec_program("${CAT}" ARGS "version" OUTPUT_VARIABLE VERSION) - - -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - SET(DISTRIB2 "OSX") -else(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - - #Try to get the distrib - exec_program("${CAT}" ARGS " /etc/issue" OUTPUT_VARIABLE DISTRIB) - MARK_AS_ADVANCED(CAT) -endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - -STRING(REPLACE "\\n \\l" "" DISTRIB2 ${DISTRIB}) - -getuname(osname -s) -getuname(node -n) -getuname(osrel -r) -getuname(cpu -m) - -#SET (BUILDNAME "${VERSION}-${osname}-${DISTRIB2}-${cpu}") -SET (BUILDNAME "${osname}-${DISTRIB2}-${cpu}") -SET (SITE "${node}") -SET (CTEST_PROJECT_NAME "Simgrid") -SET (CTEST_DROP_METHOD "http") -SET (CTEST_DROP_SITE "cdash.inria.fr/CDash") -SET (CTEST_DROP_LOCATION "/submit.php?project=Simgrid") -SET (CTEST_DROP_SITE_CDASH TRUE) -SET (CTEST_TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi") - \ No newline at end of file diff --git a/buildtools/Cmake/CTestList.txt b/buildtools/Cmake/CTestList.txt deleted file mode 100644 index cf459100cb..0000000000 --- a/buildtools/Cmake/CTestList.txt +++ /dev/null @@ -1,224 +0,0 @@ -# Build everything -ADD_TEST(config_and_build "build.sh") - -# test library -ADD_TEST(test-core "../../src/testall") - -# TESH autotests -ADD_TEST(tesh-self-basic, "../../tools/tesh/tesh" --cd ../../tools/tesh "basic.tesh") -ADD_TEST(tesh-self-cd, "../../tools/tesh/tesh" --cd ../../tools/tesh "cd.tesh") -ADD_TEST(tesh-self-IO-broken-pipe, "../../tools/tesh/tesh" --cd ../../tools/tesh "IO-broken-pipe.tesh") -ADD_TEST(tesh-self-IO-orders, "../../tools/tesh/tesh" --cd ../../tools/tesh "IO-orders.tesh") -ADD_TEST(tesh-self-IO-bigsize, "../../tools/tesh/tesh" --cd ../../tools/tesh "IO-bigsize.tesh") -ADD_TEST(tesh-self-set-return, "../../tools/tesh/tesh" --cd ../../tools/tesh "set-return.tesh") -ADD_TEST(tesh-self-set-signal, "../../tools/tesh/tesh" --cd ../../tools/tesh "set-signal.tesh") -ADD_TEST(tesh-self-set-timeout, "../../tools/tesh/tesh" --cd ../../tools/tesh "set-timeout.tesh") -ADD_TEST(tesh-self-set-ignore-output, "../../tools/tesh/tesh" --cd ../../tools/tesh "set-ignore-output.tesh") -ADD_TEST(tesh-self-catch-return, "../../tools/tesh/tesh" --cd ../../tools/tesh "catch-return.tesh") -ADD_TEST(tesh-self-catch-signal, "../../tools/tesh/tesh" --cd ../../tools/tesh "catch-signal.tesh") -ADD_TEST(tesh-self-catch-timeout, "../../tools/tesh/tesh" --cd ../../tools/tesh "catch-timeout.tesh") -ADD_TEST(tesh-self-catch-wrong-output, "../../tools/tesh/tesh" --cd ../../tools/tesh "catch-wrong-output.tesh") -ADD_TEST(tesh-self-bg-basic, "../../tools/tesh/tesh" --cd ../../tools/tesh "bg-basic.tesh") -ADD_TEST(tesh-self-bg-set-signal, "../../tools/tesh/tesh" --cd ../../tools/tesh "bg-set-signal.tesh") -ADD_TEST(tesh-self-background, "../../tools/tesh/tesh" --cd ../../tools/tesh "background.tesh") - -# testsuite directory -ADD_TEST(test-xbt-log, "./chdir_run.sh" ../../testsuite xbt/log_usage) -ADD_TEST(test-xbt-graphxml, "./chdir_run.sh" ../../testsuite xbt/graphxml_usage ./xbt/graph.xml) -ADD_TEST(test-xbt-heap, "./chdir_run.sh" ../../testsuite xbt/heap_bench) - -ADD_TEST(test-surf-lmm, "./chdir_run.sh" ../../testsuite surf/lmm_usage) -ADD_TEST(test-surf-maxmin, "./chdir_run.sh" ../../testsuite surf/maxmin_bench) -ADD_TEST(test-surf-trace, "./chdir_run.sh" ../../testsuite surf/trace_usage --cfg=path:./surf/) -ADD_TEST(test-surf-usage, "./chdir_run.sh" ../../testsuite surf/surf_usage --cfg=path:./surf/ platform.xml) -ADD_TEST(test-surf-usage2, "./chdir_run.sh" ../../testsuite surf/surf_usage2 --cfg=path:./surf/ platform.xml) - -ADD_TEST(test-simdag-1, "./chdir_run.sh" ../../testsuite simdag/sd_test --cfg=path:./simdag ./simdag/small_platform_variable.xml) -ADD_TEST(test-simdag-2, "./chdir_run.sh" ../../testsuite simdag/sd_test --cfg=path:./simdag ../../examples/msg/small_platform.xml) -ADD_TEST(test-simdag-3, "./chdir_run.sh" ../../testsuite simdag/sd_test --cfg=path:./simdag ../../examples/msg/msg_platform.xml) - -# teshsuite directory -ADD_TEST(tesh-log-large, "../../tools/tesh/tesh" --cd ../../teshsuite "xbt/log_large_test.tesh") -ADD_TEST(tesh-log-parallel, "../../tools/tesh/tesh" --cd ../../teshsuite "xbt/parallel_log_crashtest.tesh") -ADD_TEST(tesh-gras-dd-mem, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/datadesc/datadesc_mem.tesh") -ADD_TEST(tesh-gras-dd-rw, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/datadesc/datadesc_rw.tesh") - -ADD_TEST(tesh-gras-dd-r_little32_4, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/datadesc/datadesc_r_little32_4.tesh") -ADD_TEST(tesh-gras-dd-r_little64, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/datadesc/datadesc_r_little64.tesh") -ADD_TEST(tesh-gras-dd-r_big32_8_4, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/datadesc/datadesc_r_big32_8_4.tesh") - -ADD_TEST(tesh-gras-dd-r_big32_8, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/datadesc/datadesc_r_big32_8.tesh") - -ADD_TEST(tesh-gras-dd-r_big32_2, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/datadesc/datadesc_r_big32_2.tesh") - -ADD_TEST(tesh-gras-msg_handle-rl, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/msg_handle/test_rl") -IF(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-msg_handle-sg-32, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/msg_handle/test_sg_32") -ELSE(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-msg_handle-sg-64, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/msg_handle/test_sg_64") -ENDIF(${ARCH_32_BITS}) - -ADD_TEST(tesh-gras-empty_main-rl, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/empty_main/test_rl") -ADD_TEST(tesh-gras-empty_main-sg, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/empty_main/test_sg") - -IF(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-small_sleep-sg-32, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/small_sleep/test_sg_32") -ELSE(${ARCH_32_BITS}) - ADD_TEST(tesh-gras-small_sleep-sg-64, "../../tools/tesh/tesh" --cd ../../teshsuite "gras/small_sleep/test_sg_64") -ENDIF(${ARCH_32_BITS}) - -ADD_TEST(tesh-msg-get_sender, "../../tools/tesh/tesh" --cd ../../teshsuite "msg/get_sender.tesh") - -ADD_TEST(tesh-simdag-reinit_costs, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/test_reinit_costs.tesh") -ADD_TEST(tesh-simdag-parser, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/platforms/basic_parsing_test.tesh") -ADD_TEST(tesh-simdag-flatifier, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/platforms/flatifier.tesh") -# -ADD_TEST(tesh-simdag-basic0, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/basic0.tesh") -ADD_TEST(tesh-simdag-basic1, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/basic1.tesh") -ADD_TEST(tesh-simdag-basic2, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/basic2.tesh") -ADD_TEST(tesh-simdag-basic3, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/basic3.tesh") -ADD_TEST(tesh-simdag-basic4, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/basic4.tesh") -ADD_TEST(tesh-simdag-basic5, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/basic5.tesh") -ADD_TEST(tesh-simdag-basic6, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/basic6.tesh") -ADD_TEST(tesh-simdag-p2p-1, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/p2p/test_latency1.tesh") -ADD_TEST(tesh-simdag-p2p-2, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/p2p/test_latency2.tesh") -ADD_TEST(tesh-simdag-p2p-3, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/p2p/test_latency3.tesh") -ADD_TEST(tesh-simdag-p2p-3, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/p2p/test_latency_bound.tesh") - -ADD_TEST(tesh-simdag-mxn-1, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/mxn/test_intra_all2all.tesh") -ADD_TEST(tesh-simdag-mxn-2, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/mxn/test_intra_independent_comm.tesh") -ADD_TEST(tesh-simdag-mxn-3, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/network/mxn/test_intra_scatter.tesh") - -ADD_TEST(tesh-simdag-par-1, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/partask/test_comp_only_seq.tesh") -ADD_TEST(tesh-simdag-par-2, "../../tools/tesh/tesh" --cd ../../teshsuite "simdag/partask/test_comp_only_par.tesh") - -# MSG examples -ADD_TEST(msg-sendrecv_CLM03, "../../tools/tesh/tesh" --cd ../../examples/msg sendrecv/sendrecv_CLM03.tesh) -ADD_TEST(msg-sendrecv_Vegas, "../../tools/tesh/tesh" --cd ../../examples/msg sendrecv/sendrecv_Vegas.tesh) -ADD_TEST(msg-sendrecv_Reno, "../../tools/tesh/tesh" --cd ../../examples/msg sendrecv/sendrecv_Reno.tesh) -ADD_TEST(msg-suspend, "../../tools/tesh/tesh" --cd ../../examples/msg suspend/suspend.tesh) -ADD_TEST(msg-masterslave, "../../tools/tesh/tesh" --cd ../../examples/msg masterslave/masterslave.tesh) -ADD_TEST(msg-masterslave-forwarder, "../../tools/tesh/tesh" --cd ../../examples/msg masterslave/masterslave_forwarder.tesh) -ADD_TEST(msg-masterslave-failure, "../../tools/tesh/tesh" --cd ../../examples/msg masterslave/masterslave_failure.tesh) -ADD_TEST(msg-masterslave-bypass, "../../tools/tesh/tesh" --cd ../../examples/msg masterslave/masterslave_bypass.tesh) -ADD_TEST(msg-migration, "../../tools/tesh/tesh" --cd ../../examples/msg migration/migration.tesh) -ADD_TEST(msg-ptask, "../../tools/tesh/tesh" --cd ../../examples/msg parallel_task/parallel_task.tesh) -ADD_TEST(msg-priority, "../../tools/tesh/tesh" --cd ../../examples/msg priority/priority.tesh) -ADD_TEST(msg-properties, "../../tools/tesh/tesh" --cd ../../examples/msg properties/msg_prop.tesh) -ADD_TEST(msg-trace, "../../tools/tesh/tesh" --cd ../../examples/msg trace/trace.tesh) -ADD_TEST(msg-masterslave_cpu_ti, "../../tools/tesh/tesh" --cd ../../examples/msg masterslave/masterslave_cpu_ti.tesh) -ADD_TEST(msg-gtnets, "../../tools/tesh/tesh" --cd ../../examples/msg gtnets/gtnets.tesh) - -# GRAS examples -ADD_TEST(gras-ping-rl, ../../tools/tesh/tesh --cd ../../examples/gras/ping test_rl) -ADD_TEST(gras-rpc-rl, ../../tools/tesh/tesh --cd ../../examples/gras/rpc test_rl) -ADD_TEST(gras-spawn-rl, ../../tools/tesh/tesh --cd ../../examples/gras/spawn test_rl) -ADD_TEST(gras-timer-rl, ../../tools/tesh/tesh --cd ../../examples/gras/timer test_rl) -ADD_TEST(gras-chrono-rl, ../../tools/tesh/tesh --cd ../../examples/gras/chrono test_rl) -ADD_TEST(gras-simple_token-rl, ../../tools/tesh/tesh --cd ../../examples/gras/mutual_exclusion/simple_token test_rl) -ADD_TEST(gras-mmrpc-rl, ../../tools/tesh/tesh --cd ../../examples/gras/mmrpc test_rl) -ADD_TEST(gras-all2all-rl, ../../tools/tesh/tesh --cd ../../examples/gras/all2all test_rl) -ADD_TEST(gras-pmm-rl, ../../tools/tesh/tesh --cd ../../examples/gras/pmm test_rl) -ADD_TEST(gras-synchro-rl, ../../tools/tesh/tesh --cd ../../examples/gras/synchro test_rl) -ADD_TEST(gras-properties-rl, ../../tools/tesh/tesh --cd ../../examples/gras/properties test_rl) - -IF(${ARCH_32_BITS}) - ADD_TEST(gras-ping-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/ping test_sg_32) - ADD_TEST(gras-rpc-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/rpc test_sg_32) - ADD_TEST(gras-spawn-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/spawn test_sg_32) - ADD_TEST(gras-timer-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/timer test_sg_32) - ADD_TEST(gras-chrono-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/chrono test_sg_32) - ADD_TEST(gras-simple_token-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/mutual_exclusion/simple_token test_sg_32) - ADD_TEST(gras-mmrpc-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/mmrpc test_sg_32) - ADD_TEST(gras-all2all-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/all2all test_sg_32) - ADD_TEST(gras-pmm-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/pmm test_sg_32) - ADD_TEST(gras-synchro-sg-32, ../../tools/tesh/tesh --cd ../../examples/gras/synchro test_sg_32) -ELSE(${ARCH_32_BITS}) - ADD_TEST(gras-ping-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/ping test_sg_64) - ADD_TEST(gras-rpc-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/rpc test_sg_64) - ADD_TEST(gras-spawn-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/spawn test_sg_64) - ADD_TEST(gras-timer-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/timer test_sg_64) - ADD_TEST(gras-chrono-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/chrono test_sg_64) - ADD_TEST(gras-simple_token-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/mutual_exclusion/simple_token test_sg_64) - ADD_TEST(gras-mmrpc-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/mmrpc test_sg_64) - ADD_TEST(gras-all2all-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/all2all test_sg_64) - ADD_TEST(gras-pmm-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/pmm test_sg_64) - ADD_TEST(gras-synchro-sg-64, ../../tools/tesh/tesh --cd ../../examples/gras/synchro test_sg_64) -ENDIF(${ARCH_32_BITS}) -ADD_TEST(gras-properties-sg, ../../tools/tesh/tesh --cd ../../examples/gras/properties test_sg) - -# amok examples -ADD_TEST(amok-bandwidth-rl, ../../tools/tesh/tesh --cd ../../examples/amok bandwidth/bandwidth_rl.tesh) -ADD_TEST(amok-saturate-rl, ../../tools/tesh/tesh --cd ../../examples/amok saturate/saturate_rl.tesh) -IF(${ARCH_32_BITS}) - ADD_TEST(amok-bandwidth-sg-32, ../../tools/tesh/tesh --cd ../../examples/amok bandwidth/bandwidth_sg_32.tesh) - ADD_TEST(amok-saturate-sg-32, ../../tools/tesh/tesh --cd ../../examples/amok saturate/saturate_sg_32.tesh) -ELSE(${ARCH_32_BITS}) - ADD_TEST(amok-bandwidth-sg-64, ../../tools/tesh/tesh --cd ../../examples/amok bandwidth/bandwidth_sg_64.tesh) - ADD_TEST(amok-saturate-sg-64, ../../tools/tesh/tesh --cd ../../examples/amok saturate/saturate_sg_64.tesh) -ENDIF(${ARCH_32_BITS}) - -# simdag examples -ADD_TEST(simdag-test_simdag, ../../tools/tesh/tesh --cd ../../examples/simdag test_simdag.tesh) -ADD_TEST(simdag-test_simdag2, ../../tools/tesh/tesh --cd ../../examples/simdag test_simdag2.tesh) -ADD_TEST(simdag-test_prop, ../../tools/tesh/tesh --cd ../../examples/simdag properties/test_prop.tesh) -ADD_TEST(simdag-metaxml_test, ../../tools/tesh/tesh --cd ../../examples/simdag metaxml/metaxml_test.tesh) - -# java examples -ADD_TEST(java-basic, ./test_java.sh ../../examples/java/basic BasicTest) -ADD_TEST(java-pingpong, ./test_java.sh ../../examples/java/ping_pong PingPongTest) -ADD_TEST(java-comm_time, ./test_java.sh ../../examples/java/comm_time CommTimeTest) -ADD_TEST(java-suspend, ./test_java.sh ../../examples/java/suspend SuspendTest) - -# smpi examples -ADD_TEST(smpi-bcast, ../../tools/tesh/tesh --cd ../../examples/smpi bcast.tesh) -ADD_TEST(smpi-reduce, ../../tools/tesh/tesh --cd ../../examples/smpi reduce.tesh) - - -### -### Declare that we know that some tests are broken -### - -# we should install gtnets on the bots, maybe -set_tests_properties(msg-gtnets, PROPERTIES WILL_FAIL true) - - -# Amok is broken in RL since before v3.3 (should fix it one day) -set_tests_properties(amok-bandwidth-rl, PROPERTIES WILL_FAIL true) -set_tests_properties(amok-saturate-rl, PROPERTIES WILL_FAIL true) - - -# Expected to fail until we regenerate the data -set_tests_properties(tesh-gras-dd-r_big32_8, PROPERTIES WILL_FAIL true) -set_tests_properties(tesh-gras-dd-r_big32_2, PROPERTIES WILL_FAIL true) - - -# Expected to fail until the parser gets better (v3.3.5?) -set_tests_properties(simdag-metaxml_test, PROPERTIES WILL_FAIL true) -set_tests_properties(tesh-simdag-flatifier, PROPERTIES WILL_FAIL true) - -# Complains about a failed RPC. But only in 64 bits. Strange... -IF(${ARCH_32_BITS}) -ELSE(${ARCH_32_BITS}) - set_tests_properties(amok-saturate-sg-64, PROPERTIES WILL_FAIL true) -ENDIF(${ARCH_32_BITS}) - - -# These are broken, but should have their timings updated, that's all -#IF(${ARCH_32_BITS}) -# set_tests_properties(amok-bandwidth-sg-32, PROPERTIES WILL_FAIL true) -# set_tests_properties(amok-saturate-sg-32, PROPERTIES WILL_FAIL true) -#ELSE(${ARCH_32_BITS}) -# set_tests_properties(amok-bandwidth-sg-64, PROPERTIES WILL_FAIL true) -#ENDIF(${ARCH_32_BITS}) - -# Don't mark this one since we should fix it before 3.3.4 gets released -# set_tests_properties(smpi-reduce, PROPERTIES WILL_FAIL true) - - - - - - - - diff --git a/buildtools/Cmake/Cmake/DartConfiguration.tcl b/buildtools/Cmake/Cmake/DartConfiguration.tcl deleted file mode 100644 index f747f54997..0000000000 --- a/buildtools/Cmake/Cmake/DartConfiguration.tcl +++ /dev/null @@ -1,62 +0,0 @@ -# This file is configured by CMake automatically as DartConfiguration.tcl -# If you choose not to use CMake, this file may be hand configured, by -# filling in the required variables. - - -# Configuration directories and files -SourceDirectory: /home/navarrop/Developments/simgrid/Cmake -BuildDirectory: /home/navarrop/Developments/simgrid/Cmake - -# Site is something like machine.domain, i.e. pragmatic.crd -Site: Pierre Navarro - -# Build name is osname-revision-compiler, i.e. Linux-2.4.2-2smp-c++ -BuildName: Linux-c++ - -# Submission information -IsCDash: TRUE -DropSite: cdash.inria.fr/CDash -DropLocation: /submit.php?project=Simgrid -DropSiteUser: -DropSitePassword: -DropSiteMode: -DropMethod: http -TriggerSite: http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi -ScpCommand: /usr/bin/scp - -# Dashboard start time -NightlyStartTime: 00:00:00 EDT - -# Commands for the build/test/submit cycle -ConfigureCommand: "/usr/bin/cmake" "/home/navarrop/Developments/simgrid/Cmake" -MakeCommand: /usr/bin/make -i - -# CVS options -# Default is "-d -P -A" -CVSCommand: /usr/bin/cvs -CVSUpdateOptions: -d -A -P - -# Subversion options -SVNCommand: /usr/bin/svn -SVNUpdateOptions: - -# Generic update command -UpdateCommand: -UpdateOptions: -UpdateType: - -# Dynamic analisys and coverage -PurifyCommand: -ValgrindCommand: -ValgrindCommandOptions: -MemoryCheckCommand: /usr/bin/valgrind -MemoryCheckCommandOptions: -MemoryCheckSuppressionFile: -CoverageCommand: /usr/bin/gcov - -# Testing options -# TimeOut is the amount of time in seconds to wait for processes -# to complete during testing. After TimeOut seconds, the -# process will be summaily terminated. -# Currently set to 25 minutes -TimeOut: 1500 diff --git a/buildtools/Cmake/build.sh b/buildtools/Cmake/build.sh deleted file mode 100755 index f194e3b25b..0000000000 --- a/buildtools/Cmake/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -set -e -cd ../.. -if [ ! -e configure ] ; then - ./bootstrap -fi - -if [ ! -e Makefile ] ; then - ./configure --enable-maintainer-mode --disable-compile-optimizations -fi - -make -make -C testsuite xbt/log_usage xbt/heap_bench xbt/graphxml_usage -make -C testsuite surf/maxmin_bench surf/lmm_usage surf/trace_usage surf/surf_usage surf/surf_usage2 -make -C testsuite simdag/sd_test \ No newline at end of file diff --git a/buildtools/Cmake/chdir_run.sh b/buildtools/Cmake/chdir_run.sh deleted file mode 100755 index 9a44da24b0..0000000000 --- a/buildtools/Cmake/chdir_run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh -# This script goes to the directory specified as first argument, and executes the rest of its arguments -# It ought to be a solution to specify the PWD of commands in CTest, but I didn't find it yet - - -cd $1 -shift -exec "$@" diff --git a/buildtools/Cmake/script_final/DISTRIB.sh b/buildtools/Cmake/script_final/DISTRIB.sh deleted file mode 100644 index 96fcf6d045..0000000000 --- a/buildtools/Cmake/script_final/DISTRIB.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -#GET the OS name -OS=`uname` -node=`uname -n` - -# OS specific working directory -BASEDIR=/pipol -DIR=$BASEDIR/$OS/$node - -# Clean any leftover from previous install -echo "remove old directory $BASEDIR/$OS/$node" -rm -rf $BASEDIR/$OS/$node - -# create a new directory -echo "create new directory $BASEDIR/$OS/$node" -mkdir -p $BASEDIR/$OS/$node -cd $BASEDIR/$OS/$node - -echo "DISTRIB" - -# Install dependencies Linux -echo "get dependencies Linux" -sudo aptitude install -y libtool automake1.10 autoconf libgcj10-dev gcc g++ bash flex flexml doxygen bibtex bibtool iconv bibtex2html addr2line valgrind - -# delete the old distrib -rm $BASEDIR/simgrid*.tar.gz - -# load the simgrid directory from svn -echo "load simgrid-svn" -svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid -cd $BASEDIR/$OS/$node/simgrid - -# ./bootstrap -echo "./bootstrap" -./bootstrap - -# ./configure -echo "./configure --enable-maintainer-mode --disable-compile-optimizations" -./configure --enable-maintainer-mode --disable-compile-optimizations - -# make -echo "make" -make - -# make dist -echo "make dist" -make dist - -# copy du Cmake sur BASEDIR -cp -r buildtools/ctest/Cmake $BASEDIR/ - -# copie de la distrib sur BASEDIR -cp simgrid*.tar.gz $BASEDIR/ - -# suppression des fichiers tmp -cd .. -rm -rf simgrid - -echo "Done!" diff --git a/buildtools/Cmake/script_final/DISTRIB_nightly.sh b/buildtools/Cmake/script_final/DISTRIB_nightly.sh deleted file mode 100644 index 31bbcc3c89..0000000000 --- a/buildtools/Cmake/script_final/DISTRIB_nightly.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -#PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent - -#GET the OS name -OS=`uname` -node=`uname -n` - -# OS specific working directory -BASEDIR=/pipol -DIR=$BASEDIR/$OS/$node - -# Clean any leftover from previous install -echo "remove old directory $BASEDIR/$OS/$node" -rm -rf $BASEDIR/$OS/$node - -# create a new directory -echo "create new directory $BASEDIR/$OS/$node" -mkdir $BASEDIR/$OS -mkdir $BASEDIR/$OS/$node -cd $BASEDIR/$OS/$node - -echo "DISTRIB" - -# Install dependencies Linux -echo "get dependencies Linux" -sudo aptitude install -y libtool automake1.10 autoconf libgcj10-dev gcc g++ bash flex flexml doxygen bibtex bibtool iconv bibtex2html addr2line valgrind - -# delete the old distrib -rm $BASEDIR/simgrid*.tar.gz - -# load the simgrid directory from svn -echo "load simgrid-svn" -svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk -mv trunk/ simgrid -cd $BASEDIR/$OS/$node/simgrid - -# ./bootstrap -echo "./bootstrap" -./bootstrap - -# ./configure -echo "./configure --enable-maintainer-mode --disable-compile-optimizations" -./configure --enable-maintainer-mode --disable-compile-optimizations - -# make -echo "make" -make - -# make dist -echo "make dist" -make dist - -# copy du Cmake sur BASEDIR -cp -r buildtools/ctest/Cmake $BASEDIR/ - -# copie de la distrib sur BASEDIR -cp simgrid*.tar.gz $BASEDIR/ - -# suppression des fichiers tmp -cd .. -rm -rf simgrid - -echo "Done!" diff --git a/buildtools/Cmake/script_final/WAIT.sh b/buildtools/Cmake/script_final/WAIT.sh deleted file mode 100644 index effb7b738f..0000000000 --- a/buildtools/Cmake/script_final/WAIT.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -#GET the OS name -OS=`uname` -node=`uname -n` - -# OS specific working directory -BASEDIR=/pipol -DIR=$BASEDIR/$OS/$node - -# Clean any leftover from previous install -echo "remove old directory $BASEDIR/$OS/$node" -rm -rf $BASEDIR/$OS/$node - -# create a new directory -echo "create new directory $BASEDIR/$OS/$node" -mkdir $BASEDIR/$OS -mkdir $BASEDIR/$OS/$node -cd $BASEDIR/$OS/$node - -echo "WAIT" -echo "attente de distrib" -while [ ! -e $BASEDIR/simgrid*.tar.gz ]; -do - wait 1 - #nothing to do except waiting -done -echo "distrib disponible" - -# recuperation de la distrib -cp $BASEDIR/simgrid*.tar.gz $BASEDIR/$OS/$node/simgrid*.tar.gz -cd $BASEDIR/$OS/$node - -# untar de la distrib -tar xzvf ./simgrid*.tar.gz -rm simgrid*.tar.gz - -# copie de Cmake -cp -r $BASEDIR/Cmake $BASEDIR/$OS/$node/simgrid/Cmake - -# ./configure -cd $BASEDIR/$OS/$node/simgrid -./configure - -# make -echo "make" -make - -# 1er test -echo "./checkall" -./checkall - -# 2eme test ctest -sudo aptitude install -y cmake -cd $BASEDIR/$OS/$node/simgrid/Cmake -cmake ./ -ctest -D Experimental CTEST_FULL_OUTPUT - -echo "Done!" diff --git a/buildtools/Cmake/script_final/WAIT_nightly.sh b/buildtools/Cmake/script_final/WAIT_nightly.sh deleted file mode 100644 index 5db366b80b..0000000000 --- a/buildtools/Cmake/script_final/WAIT_nightly.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -#PIPOL esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent -#PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent -#PIPOL esn amd64-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent -#PIPOL esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent - -#PIPOL esn i386-linux-debian-etch.dd.gz none 02:00 --user --silent -#PIPOL esn i386-linux-debian-lenny.dd.gz none 02:00 --user --silent -#PIPOL esn amd64-linux-debian-etch.dd.gz none 02:00 --user --silent -#PIPOL esn amd64-linux-debian-lenny.dd.gz none 02:00 --user --silent - -#PIPOL esn i386-linux-fedora-core11.dd.gz none 02:00 --user --silent -#PIPOL esn amd64-linux-fedora-core11.dd.gz none 02:00 --user --silent - -#PIPOL esn i386-linux-mandriva-2009_powerpack.dd.gz none 02:00 --user --silent -#PIPOL esn amd64-linux-mandriva-2009_powerpack.dd.gz none 02:00 --user --silent - -#PIPOL esn i386_mac-mac-osx-server-leopard.dd.gz none 02:00 --user --silent - -#GET the OS name -OS=`uname` -node=`uname -n` - -# OS specific working directory -BASEDIR=/pipol -DIR=$BASEDIR/$OS/$node - -# Clean any leftover from previous install -echo "remove old directory $BASEDIR/$OS/$node" -rm -rf $BASEDIR/$OS/$node - -# create a new directory -echo "create new directory $BASEDIR/$OS/$node" -mkdir $BASEDIR/$OS -mkdir $BASEDIR/$OS/$node -cd $BASEDIR/$OS/$node - -echo "WAIT" -echo "attente de distrib" -while [ ! -e $BASEDIR/simgrid*.tar.gz ]; -do - wait 1 - #nothing to do except waiting -done -echo "distrib disponible" - -# recuperation de la distrib -cp $BASEDIR/simgrid*.tar.gz $BASEDIR/$OS/$node/simgrid*.tar.gz -cd $BASEDIR/$OS/$node - -# untar de la distrib -tar xzvf ./simgrid*.tar.gz -rm simgrid*.tar.gz - -# copie de Cmake -cp -r $BASEDIR/Cmake $BASEDIR/$OS/$node/simgrid/Cmake - -# ./configure -cd $BASEDIR/$OS/$node/simgrid -./configure - -# make -echo "make" -make - -# 1er test -echo "./checkall" -./checkall - -# 2eme test ctest -sudo aptitude install -y cmake -cd $BASEDIR/$OS/$node/simgrid/Cmake -cmake ./ -ctest -D Experimental CTEST_FULL_OUTPUT - -echo "Done!" diff --git a/buildtools/Cmake/script_final/reserv.sh b/buildtools/Cmake/script_final/reserv.sh deleted file mode 100644 index 8f9287a103..0000000000 --- a/buildtools/Cmake/script_final/reserv.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -ssh pipol pipol-sub esn i386-linux-ubuntu-karmic.dd.gz none 02:00 /home/mescal/navarro/script/DISTRIB.sh - -ssh pipol pipol-sub esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 /home/mescal/navarro/script/WAIT.sh -ssh pipol pipol-sub esn i386-linux-ubuntu-karmic.dd.gz none 02:00 /home/mescal/navarro/script/WAIT.sh diff --git a/buildtools/Cmake/script_final/testwait.sh b/buildtools/Cmake/script_final/testwait.sh deleted file mode 100644 index 8afaddbd58..0000000000 --- a/buildtools/Cmake/script_final/testwait.sh +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -#GET the OS name -OS=`uname` -node=`uname -n` - -# OS specific working directory -BASEDIR=/pipol -DIR=$BASEDIR/$OS/$node - -# Clean any leftover from previous install -echo "remove old directory $BASEDIR/$OS/$node" -rm -rf $BASEDIR/$OS/$node - -# create a new directory -echo "create new directory $BASEDIR/$OS/$node" -mkdir $BASEDIR/$OS -mkdir $BASEDIR/$OS/$node -cd $BASEDIR/$OS/$node - -if [ ! $# = 0 ]; then - if [ $1 = "DISTRIB" ]; then - - echo "DISTRIB" - - # Install dependencies Linux - echo "get dependencies Linux" - sudo aptitude install -y libtool automake1.10 autoconf libgcj10-dev gcc g++ bash flex flexml doxygen bibtex bibtool iconv bibtex2html addr2line valgrind - - # delete the old distrib - rm $BASEDIR/simgrid*.tar.gz - - # load the simgrid directory from svn - echo "load simgrid-svn" - svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk - mv trunk/ simgrid - cd $BASEDIR/$OS/$node/simgrid - - # ./bootstrap - echo "./bootstrap" - ./bootstrap - - # ./configure - echo "./configure --enable-maintainer-mode --disable-compile-optimizations" - ./configure --enable-maintainer-mode --disable-compile-optimizations - - # make - echo "make" - make - - # make dist - echo "make dist" - make dist - - # copy du Cmake sur BASEDIR - cp -r buildtools/ctest/Cmake $BASEDIR/ - - # copie de la distrib sur BASEDIR - cp simgrid*.tar.gz $BASEDIR/ - - # suppression des fichiers tmp - cd .. - rm -rf simgrid - - else - if [ $1 = "WAIT" ]; then - echo "WAIT" - echo "attente de distrib" - while [ ! -e $BASEDIR/simgrid*.tar.gz ]; - do - wait 1 - #nothing to do except waiting - done - echo "distrib disponible" - - # recuperation de la distrib - cp $BASEDIR/simgrid*.tar.gz $BASEDIR/$OS/$node/simgrid*.tar.gz - cd $BASEDIR/$OS/$node - - # untar de la distrib - tar xzvf ./simgrid*.tar.gz - rm simgrid*.tar.gz - - # copie de Cmake - cp -r $BASEDIR/Cmake $BASEDIR/$OS/$node/simgrid/Cmake - - # ./configure - cd $BASEDIR/$OS/$node/simgrid - ./configure - - # make - echo "make" - make - - # 1er test - echo "./checkall" - ./checkall - - # 2eme test ctest - sudo aptitude install -y cmake - cd $BASEDIR/$OS/$node/simgrid/Cmake - cmake ./ - ctest -D Experimental CTEST_FULL_OUTPUT - - - else - echo "argument non connu" - exit - fi - fi -else - echo "pas d'argument" -fi - -echo "Done!" diff --git a/buildtools/Cmake/test_java.sh b/buildtools/Cmake/test_java.sh deleted file mode 100755 index f126228583..0000000000 --- a/buildtools/Cmake/test_java.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh -export LD_LIBRARY_PATH="../src/.libs:$LD_LIBRARY_PATH" -export CLASSPATH=".:../src/simgrid.jar:$CLASSPATH" -cd $1 -if [ ! -e $2.class ] ; then - rm classnoinst.stamp - make classnoinst.stamp -fi -pwd -echo LD_LIBRARY_PATH="../../../src/.libs:$LD_LIBRARY_PATH" java -cp ".:../../../src/simgrid.jar:$CLASSPATH" $options $2 *platform.xml *deployment.xml -LD_LIBRARY_PATH="../../../src/.libs:$LD_LIBRARY_PATH" java -cp ".:../../../src/simgrid.jar:$CLASSPATH" $options $2 *platform.xml *deployment.xml \ No newline at end of file