Skip to content

Commit

Permalink
Move srun_dawn_PR.sh to scripts/daint_test.sh (#924)
Browse files Browse the repository at this point in the history
Move testing script.
  • Loading branch information
jdahm authored Apr 15, 2020
1 parent 7c3bad7 commit c9c4c39
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
18 changes: 18 additions & 0 deletions scripts/build-and-test
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ dawn_install_dir=/usr/local
# Empty prefix
unset prefix

# By default, don't copy test xml back to root source dir
copy_test_xml=false

# Build arguments
build_args=()

Expand Down Expand Up @@ -57,6 +60,9 @@ while [ "$1" != "" ]; do
-Deckit_DIR=/usr/local/eckit/lib/cmake/eckit
-GNinja)
;;
--copy-test-xml)
copy_test_xml=true
;;
*)
build_args+=($1)
;;
Expand Down Expand Up @@ -94,3 +100,15 @@ if [ "$run_tests" == "true" ]; then
(cd $cg_build_dir && $prefix ctest --output-on-failure --force-new-ctest-process --max-width 80)
fi
fi

if [ "$copy_test_xml" = "true" ]; then
i=0
for xml in $(find $dawn_build_dir -path "*/_deps" -prune -o -name "*.xml" -print); do
cp $xml $dawn_source_dir/gtest_${i}.xml
i=$((i+1))
done
for xml in $(find $cg_build_dir -path "*/_deps" -prune -o -name "*.xml" -print); do
cp $xml $dawn_source_dir/gtest_${i}.xml
i=$((i+1))
done
fi
5 changes: 3 additions & 2 deletions scripts/jenkins/srun_dawn_PR.sh → scripts/daint-test
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
#!/usr/bin/env sh

script_path=$(dirname $(which $0))
root_dir=$script_path/../../
root_dir=$script_path/../

image=gtclang/dawn-env-cuda10.1-ubuntu18.04
build_jobs=24
Expand Down Expand Up @@ -40,5 +40,6 @@ srun --job-name=dawn_PR \
--clang-gridtools-build-dir /usr/src/clang-gridtools-build \
--parallel $build_jobs \
--docker-env \
--copy-test-xml \
-DCMAKE_BUILD_TYPE=$build_type \
-DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc

0 comments on commit c9c4c39

Please sign in to comment.