From f73207bc6fb69bcabd1f1b0482f8579e087a7a98 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 11 Aug 2015 19:39:45 +0200 Subject: [PATCH] remove unused jenkins scripts, and document some others --- buildtools/jenkins/build.sh | 5 ++ buildtools/jenkins/makedist.sh | 36 -------------- buildtools/jenkins/run.sh | 91 ---------------------------------- 3 files changed, 5 insertions(+), 127 deletions(-) delete mode 100755 buildtools/jenkins/makedist.sh delete mode 100755 buildtools/jenkins/run.sh diff --git a/buildtools/jenkins/build.sh b/buildtools/jenkins/build.sh index 61f8acd6f4..a853ee38b7 100755 --- a/buildtools/jenkins/build.sh +++ b/buildtools/jenkins/build.sh @@ -1,5 +1,10 @@ #!/bin/sh +# This script is used by various build projects on Jenkins + +# See https://ci.inria.fr/simgrid/job/SimGrid-Multi/configure +# See https://ci.inria.fr/simgrid/job/Simgrid-Windows/configure + set -e # usage: die status message... diff --git a/buildtools/jenkins/makedist.sh b/buildtools/jenkins/makedist.sh deleted file mode 100755 index 60a0bdc365..0000000000 --- a/buildtools/jenkins/makedist.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -if [ -d $WORKSPACE/build ] -then - rm -rf $WORKSPACE/build -fi -if [ -d $WORKSPACE/install ] -then - rm -rf $WORKSPACE/install -fi -mkdir $WORKSPACE/build -mkdir $WORKSPACE/install -cd $WORKSPACE/build - -cmake $WORKSPACE -make -make dist -make distcheck -tar xzf `cat VERSION`.tar.gz -cd `cat VERSION` - -if [ "$build_mode" = "Debug" ] -then -cmake -Denable_coverage=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=OFF . -fi - -if [ "$build_mode" = "ModelChecker" ] -then -cmake -Denable_coverage=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=OFF . -fi - -if [ "$build_mode" = "DynamicAnalysis" ] -then -cmake -Denable_lua=OFF -Denable_tracing=ON -Denable_smpi=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=ON . -fi -make \ No newline at end of file diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh deleted file mode 100755 index f726799b43..0000000000 --- a/buildtools/jenkins/run.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -WORKSPACE=$1 -build_mode=$2 - -# usage: die status message... -die () { - local status=${1:-1} - shift - [ $# -gt 0 ] || set -- "Error - Halting" - echo "$@" >&2 - exit $status -} - -ulimit -c 0 - -rm -rf $WORKSPACE/build - -mkdir $WORKSPACE/build -cd $WORKSPACE/build - -export PATH=./lib/:../../lib:$PATH - -if test "$(uname -o)" = "Msys" -then - #$NUMBER_OF_PROCESSORS should be already set on win - if [ -z "$NUMBER_OF_PROCESSORS" ]; then - NUMBER_OF_PROCESSORS=1 - fi - - cmake -G "MSYS Makefiles" -Denable_documentation=OFF $WORKSPACE || die 1 "Failed to do the first cmake - Halting" - - make dist || die 2 "Failed to build dist - Halting" - - cmake -G "MSYS Makefiles" -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=OFF -Denable_documentation=OFF . \ - || die 5 "Failed to perform the Cmake for $build_mode - Halting" - - make -j$NUMBER_OF_PROCESSORS || die 5 "Build failure - Halting" - - make nsis || die 6 "Failure while generating the Windows executable - Halting" - -else - # Linux: - cpuinfo_file="/proc/cpuinfo" - NUMBER_OF_PROCESSORS=$(lscpu -p 2>/dev/null | grep -c '^[^#]') || \ - NUMBER_OF_PROCESSORS=$(grep -c "^processor[[:space:]]*:" ${cpuinfo_file} 2>/dev/null) - [ "0$NUMBER_OF_PROCESSORS" -gt 0 ] || NUMBER_OF_PROCESSORS=1 - - cmake -Denable_documentation=OFF $WORKSPACE || die 1 "Failed to do the first cmake - Halting" - - rm Simgrid*.tar.gz - make dist || die 2 "Failed to build dist - Halting" - - tar xzf `cat VERSION`.tar.gz || die 3 "Failed to extract the generated tgz - Halting" - - cd `cat VERSION` || die 4 "Path `cat VERSION` cannot be found - Halting" - - if [ "$build_mode" = "Debug" ] - then - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON . - fi - - if [ "$build_mode" = "ModelChecker" ] - then - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_smpi=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON . - fi - - if [ "$build_mode" = "DynamicAnalysis" ] - then - cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_java=ON -Denable_tracing=ON -Denable_smpi=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=ON . - fi - - [ $? -eq 0 ] || die 5 "Failed to perform the Cmake for $build_mode - Halting" - - make -j$NUMBER_OF_PROCESSORS || die 6 "Build failure - Halting" -fi - -echo "running tests with $NUMBER_OF_PROCESSORS processors" - -ctest --output-on-failure -T test --no-compress-output --timeout 100 -j$NUMBER_OF_PROCESSORS || true -if [ -f Testing/TAG ] ; then - xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl -o "$WORKSPACE/CTestResults.xml" Testing/`head -n 1 < Testing/TAG`/Test.xml -fi - -ctest -D ContinuousStart -ctest -D ContinuousConfigure -ctest -D ContinuousBuild -ctest -D ContinuousTest -ctest -D ContinuousSubmit - -rm -rf `cat VERSION` -- 2.20.1