@@ -45,7 +45,7 @@ install:
4545- case "$BUILD" in
4646 stack)
4747 stack $ARGS setup --no-terminal;
48− stack $ARGS build --no-terminal --only-snapshot --test
48+ stack $ARGS build --no-terminal --only-snapshot --test --no-run-tests;
4949 ;;
5050 cabal)
5151 cabal install --jobs=2 --enable-tests --only-dependencies -ftcp . distributed-process-tests/
@@ -55,23 +55,21 @@ install:
5555script:
5656- case "$BUILD" in
5757 stack)
58− stack $ARGS --no-terminal build --test --no-run-tests;
59− cd distributed-process-tests;
60− export BUILD_DIR=.stack-work/dist/x86_64-linux/Cabal-$CABALVER/build
58+ export ARG='--test-arguments'
59+ export TEST_PACKAGE="distributed-process-tests:"
6160 ;;
6261 cabal)
63− cabal install --enable-tests;
64− cabal install --jobs=2;
65− cd distributed-process-tests/;
62+ cabal install --jobs=2 --enable-tests -ftcp .
63+ cd distributed-process-tests;
6664 cabal configure -ftcp --enable-tests;
6765 cabal build --jobs=2;
68− export BUILD_DIR=dist/build
66+ export ARG='--test-options'
67+ export TEST_PACKAGE=""
6968 ;;
7069 esac
71− # skip intermittent tests
72−- $BUILD_DIR/TestCHInMemory/TestCHInMemory --plain -t '!Flaky'
73−- $BUILD_DIR/TestCHInTCP/TestCHInTCP --plain -t '!Flaky'
74−- $BUILD_DIR/TestClosure/TestClosure --plain -t '!SpawnReconnect'
75−- $BUILD_DIR/TestStats/TestStats --plain
76−- $BUILD_DIR/TestMx/TestMx --plain
77−- $BUILD_DIR/TestTracing/TestTracing --plain
70+- $BUILD ${ARGS} test $ARG='--plain -t "!Flaky"' ${TEST_PACKAGE}TestCHInMemory
71+- $BUILD ${ARGS} test $ARG='--plain -t "!Flaky"' ${TEST_PACKAGE}TestCHInTCP
72+- $BUILD ${ARGS} test $ARG='--plain -t "!SpawnReconnect"' ${TEST_PACKAGE}TestClosure
73+- $BUILD ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestStats
74+- $BUILD ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestMx
75+- $BUILD ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestTracing