git.iko.soy/servant-reflex
on master help sign in
Travis tweaks to find hpc output
36e8eedGreg Hale
deploy.sh+1−1
compare with master
unifiedsplit
@@ -30,7 +30,7 @@ git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH
30cd ..
30cd ..
31
31
32# Clean out existing contents
32# Clean out existing contents
33−rm -rf $OUT/**/* || exit 0
33+rm -rf $OUT/* || exit 0
34
34
35# Run our compile script
35# Run our compile script
36doCompile
36doCompile
runTestsAndCoverage.sh+9−1
@@ -4,7 +4,7 @@ set -e
4
4
5# All directory variables relative to project root
5# All directory variables relative to project root
6# DIR=dist-newstyle/hpc
6# DIR=dist-newstyle/hpc
7−DIR=dist/hpc
7+DIR=./dist/hpc
8
8
9#SUITE=./dist-newstyle/build/servant-reflex-0.2/build/testsuite/testsuite
9#SUITE=./dist-newstyle/build/servant-reflex-0.2/build/testsuite/testsuite
10SUITE=./dist/build/testsuite/testsuite
10SUITE=./dist/build/testsuite/testsuite
@@ -40,8 +40,16 @@ for m in $EXCLUDES; do
40done
40done
41
41
42# TODO - actually send results to /dev/null when hpc kinks are fully removed
42# TODO - actually send results to /dev/null when hpc kinks are fully removed
43+echo "Call hpc:"
44+echo hpc markup $EXCL --destdir=$DIR testsuite # >/dev/null 2>&1
43hpc markup $EXCL --destdir=$DIR testsuite # >/dev/null 2>&1
45hpc markup $EXCL --destdir=$DIR testsuite # >/dev/null 2>&1
44
46
47+echo "ls $DIR:"
48+ls $DIR
49+
50+echo "ls:"
51+ls
52+
45cp -r $DIR out/
53cp -r $DIR out/
46
54
47cat <<EOF
55cat <<EOF