Removing Readme.smartos and addressing sh and Makefile nitsgrr-OS-7943

3 files changed, 4 insertions, 26 deletions

diff --git a/usr/src/test/Readme.smartos b/usr/src/test/Readme.smartos
deleted file mode 100644
index 744a324bfe..0000000000
--- a/usr/src/test/Readme.smartos
+++ /dev/null
@@ -1,22 +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 2019 Joyent, Inc.
-#
-
-The procedure to run the Illumos tests under SmartOS differs from other
-distributions because of the zone-centric nature of the distribution,
-and because there is no built-in package management for the global zone.
-
-See ./smartos-test/README which describes a wrapper script which configures
-a SmartOS system for testing, and optionally executes selected test suites.
-
diff --git a/usr/src/test/smartos-test/Makefile b/usr/src/test/smartos-test/Makefile
index a182a3a118..1277987fac 100644
--- a/usr/src/test/smartos-test/Makefile
+++ b/usr/src/test/smartos-test/Makefile
@@ -28,7 +28,7 @@ $(ROOTPROGS) :=	FILEMODE = 0555
 ROOTFILES=	$(FILES:%=$(ROOTOPTPKG)/%)
 $(ROOTFILES) := FILEMODE = 0444
 
-all lint clean clobber:
+all clean clobber:
 
 install:	$(ROOTPROGS) $(ROOTFILES)
 
diff --git a/usr/src/test/smartos-test/smartos-test.sh b/usr/src/test/smartos-test/smartos-test.sh
index 83cf30c46d..7cc32db76d 100755
--- a/usr/src/test/smartos-test/smartos-test.sh
+++ b/usr/src/test/smartos-test/smartos-test.sh
@@ -175,7 +175,7 @@ function add_loopback_mounts {
         log_must tar -xzf $test_archive -C $lofs_home ./usr
         # keep /usr read-only in an attempt to preserve smartos behaviour
         # unless specifically asked to
-        if [[ "$MOUNT_USR_RW" = "true" ]]; then
+        if [[ "$mount_usr_rw" = "true" ]]; then
             mount_opts="-o rw"
         else
             mount_opts="-o ro"
@@ -295,7 +295,7 @@ function usage {
     echo "  -w       when mounting the lofs /usr, make it writable"
 }
 
-MOUNT_USR_RW=false
+mount_usr_rw=false
 skip_version_check=false
 do_configure=false
 do_execute=false
@@ -323,7 +323,7 @@ while getopts "cefrwh" opt; do
             exit 2
             ;;
         w)
-            MOUNT_USR_RW=true
+            mount_usr_rw=true
             ;;
         *)
             log "unknown argument ${opt}"