-# Run tests
-$MAKE --keep-going check
-# Only run regtest for 0.9 and up
-if vergte "$PACKAGE_VERSION" "0.9"; then
- $MAKE regtest
+# Install in the workspace
+$MAKE install DESTDIR="$WORKSPACE"
+
+# Run tests, don't fail now, we want to run the archiving steps
+failed_tests=0
+if [ "$USERSPACE_RCU_RUN_TESTS" = "yes" ]; then
+ $MAKE --keep-going check || failed_tests=1
+ # Only run regtest for 0.9 and up
+ if vergte "$PACKAGE_VERSION" "0.9"; then
+ $MAKE --keep-going regtest || failed_tests=1
+ fi
+
+ # Copy tap logs for the jenkins tap parser before cleaning the build dir
+ rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
+
+ # The test suite prior to 0.11 did not produce TAP logs
+ if verlt "$PACKAGE_VERSION" "0.11"; then
+ mkdir -p "$WORKSPACE/tap/no-log"
+ echo "1..1" > "$WORKSPACE/tap/no-log/tests.log"
+ echo "ok 1 - Test suite doesn't support logging" >> "$WORKSPACE/tap/no-log/tests.log"
+ fi