Add -threads option to runtest.sh

And fixup the test defintion so that the tests get run.

libomp.spec

@@ -6,7 +6,7 @@
 
 Name: libomp
 Version: 6.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: OpenMP runtime for clang
 
 License: NCSA
@@ -130,6 +130,9 @@ install -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/libomp
 %{_datadir}/libomp
 
 %changelog
+* Mon Jul 02 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-2
+- Add -threads option to runtest.sh
+
 * Thu Jun 28 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
 - 6.0.1 Release
 

runtest.sh

@@ -1,8 +1,33 @@
 #!/bin/bash
 
+usage() {
+    echo "usage: `basename $0` [OPTIONS]"
+    echo "  --threads NUM       The number of threads to use for running tests."
+}
+
+
+threads_arg=''
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--threads)
+            shift
+            threads_arg="--threads $1"
+            ;;
+        * )
+            echo "unknown option: $1"
+            echo ""
+            usage
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+
 set -x
 
-lit -v --config-prefix clang /usr/share/libomp/src/runtime/test
+lit $threads_arg -v --config-prefix clang /usr/share/libomp/src/runtime/test
 fail=$?
-lit -v --config-prefix gcc /usr/share/libomp/src/runtime/test
+lit $threads_arg -v --config-prefix gcc /usr/share/libomp/src/runtime/test
 exit $fail || $?

tests/tests.yml

@@ -1,10 +1,11 @@
 - hosts: localhost
   roles:
   - role: standard-test-basic
-    tests:
-    - libomp-regression-tests
-    environment:
-      TEST_CMD:
-        "/usr/share/libomp/runtest.sh"
+    tags:
+      - classic
     required_packages:
-    - libomp-test
+      - libomp-test
+    tests:
+      - libomp-regression-tests:
+          dir: ./
+          run: /usr/share/libomp/runtest.sh --threads 8