Skip to content

Commit a16152d

Browse files
committed
Attempt to fix tests.
1 parent b728d6a commit a16152d

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ notifications:
1313
language: C++
1414

1515
before_install:
16-
- ./scripts/dr.sh "cd app; ./scripts/check_indentation.sh"
16+
- ./scripts/dr.sh "./scripts/check_indentation.sh"
1717

1818
script:
19-
- ./scripts/dr.sh "test -d app/build-travis && rm -rf app/build-travis; mkdir app/build-travis; cd app/build-travis; cmake -GNinja ../ -DBEM_ENABLE_TESTING=ON; ninja"
20-
- ./scripts/dr.sh "cd app/build-travis; ctest -N; ctest -V"
19+
- ./scripts/dr.sh "test -d build-travis && rm -rf build-travis; mkdir build-travis; cd build-travis; cmake -GNinja ../ -DBEM_ENABLE_TESTING=ON; ninja"
20+
- ./scripts/dr.sh "cd build-travis; ctest -N; ctest -V"

scripts/dr.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
docker run -P -v `pwd`:/home/dealii/app:rw mathlab/deal2lkit:dev-debugrelease /bin/sh -c "$@"
1+
#!/bin/bash
2+
docker run --user $(id -u):$(id -g) -i -t --rm -P -v `pwd`:/app:rw mathlab/deal2lkit:v9.1.1-debugrelease /bin/sh -c "cd /app; $@"

scripts/run_docker.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
#!/bin/bash
2-
IMG=mathlab/deal2lkit:latest #`grep image .travis.yml | awk '{print $2}'`
3-
echo $IMG
4-
52
CMD=`grep -e '- ' .travis.yml | sed 's/- //'`
6-
echo $CMD
7-
docker pull $IMG
8-
docker run -v `pwd`/..:/app/ $IMG /bin/sh -c "cd /app && $CMD"
3+
docker run --user $(id -u):$(id -g) -i -t --rm -P -v `pwd`:/app:rw mathlab/deal2lkit:v9.1.1-debugrelease /bin/sh -c "cd /app; $CMD"

0 commit comments

Comments
 (0)