7417 os-tests could conslidate the per-distro pieces

Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>

6 files changed, 7 insertions, 68 deletions

diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.mf
index fde9d5bb0a..7635421a19 100644
--- a/usr/src/pkg/manifests/system-test-ostest.mf
+++ b/usr/src/pkg/manifests/system-test-ostest.mf
@@ -12,6 +12,7 @@
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2016, Joyent, Inc.
 #
 
 set name=pkg.fmri value=pkg:/system/test/ostest@$(PKGVERS)
@@ -27,9 +28,7 @@ dir path=opt/os-tests/tests
 dir path=opt/os-tests/tests/sigqueue
 file path=opt/os-tests/README mode=0444
 file path=opt/os-tests/bin/ostest mode=0555
-file path=opt/os-tests/runfiles/delphix.run mode=0444
-file path=opt/os-tests/runfiles/omnios.run mode=0444
-file path=opt/os-tests/runfiles/openindiana.run mode=0444
+file path=opt/os-tests/runfiles/default.run mode=0444
 file path=opt/os-tests/tests/poll_test mode=0555
 file path=opt/os-tests/tests/sigqueue/sigqueue_queue_size mode=0555
 file path=opt/os-tests/tests/spoof-ras mode=0555
diff --git a/usr/src/test/os-tests/cmd/ostest.ksh b/usr/src/test/os-tests/cmd/ostest.ksh
index afa944b613..d30e7fe6eb 100644
--- a/usr/src/test/os-tests/cmd/ostest.ksh
+++ b/usr/src/test/os-tests/cmd/ostest.ksh
@@ -14,6 +14,7 @@
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2016, Joyent, Inc.
 #
 
 export OS_TESTS="/opt/os-tests"
@@ -28,12 +29,8 @@ function fail
 function find_runfile
 {
 	typeset distro=
-	if [[ -d /opt/delphix && -h /etc/delphix/version ]]; then
-		distro=delphix
-	elif [[ 0 -ne $(grep -c OpenIndiana /etc/release 2>/dev/null) ]]; then
-		distro=openindiana
-	elif [[ 0 -ne $(grep -c OmniOS /etc/release 2>/dev/null) ]]; then
-		distro=omnios
+	if [[ -f $OS_TESTS/runfiles/default.run ]]; then
+		distro=default
 	fi
 
 	[[ -n $distro ]] && echo $OS_TESTS/runfiles/$distro.run
diff --git a/usr/src/test/os-tests/runfiles/Makefile b/usr/src/test/os-tests/runfiles/Makefile
index 619c9b812a..a4346ca2c9 100644
--- a/usr/src/test/os-tests/runfiles/Makefile
+++ b/usr/src/test/os-tests/runfiles/Makefile
@@ -12,13 +12,12 @@
 #
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright 2016, Joyent, Inc.
 #
 
 include $(SRC)/Makefile.master
 
-SRCS = delphix.run \
-	omnios.run \
-	openindiana.run
+SRCS = default.run
 
 ROOTOPTPKG = $(ROOT)/opt/os-tests
 RUNFILES = $(ROOTOPTPKG)/runfiles
diff --git a/usr/src/test/os-tests/runfiles/delphix.run b/usr/src/test/os-tests/runfiles/default.run
index 4e73ebc8b3..4e73ebc8b3 100644
--- a/usr/src/test/os-tests/runfiles/delphix.run
+++ b/usr/src/test/os-tests/runfiles/default.run
diff --git a/usr/src/test/os-tests/runfiles/omnios.run b/usr/src/test/os-tests/runfiles/omnios.run
deleted file mode 100644
index 4e73ebc8b3..0000000000
--- a/usr/src/test/os-tests/runfiles/omnios.run
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright (c) 2012 by Delphix. All rights reserved.
-#
-
-[DEFAULT]
-pre =
-verbose = False
-quiet = False
-timeout = 60
-post =
-outputdir = /var/tmp/test_results
-
-[/opt/os-tests/tests/poll_test]
-user = root
-
-[/opt/os-tests/tests/sigqueue]
-tests = ['sigqueue_queue_size']
diff --git a/usr/src/test/os-tests/runfiles/openindiana.run b/usr/src/test/os-tests/runfiles/openindiana.run
deleted file mode 100644
index 4e73ebc8b3..0000000000
--- a/usr/src/test/os-tests/runfiles/openindiana.run
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright (c) 2012 by Delphix. All rights reserved.
-#
-
-[DEFAULT]
-pre =
-verbose = False
-quiet = False
-timeout = 60
-post =
-outputdir = /var/tmp/test_results
-
-[/opt/os-tests/tests/poll_test]
-user = root
-
-[/opt/os-tests/tests/sigqueue]
-tests = ['sigqueue_queue_size']