aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/test/sort.test7
-rw-r--r--scripts/test/testing.sh2
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/test/sort.test b/scripts/test/sort.test
index 389b9fd7..cb82dc07 100755
--- a/scripts/test/sort.test
+++ b/scripts/test/sort.test
@@ -1,10 +1,9 @@
#!/bin/bash
-# SUSv3 compliant sort tests.
-# Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# SUSv4 compliant sort tests.
+# Copyright 2005, 2012 by Rob Landley <rob@landley.net>
-. testing.sh
+[ -f testing.sh ] && . testing.sh
# The basic tests. These should work even with the small config.
diff --git a/scripts/test/testing.sh b/scripts/test/testing.sh
index fd233697..0f72bce4 100644
--- a/scripts/test/testing.sh
+++ b/scripts/test/testing.sh
@@ -34,6 +34,8 @@ export SKIP=
# Helper functions
+# Check config to see if option is enabled, set SKIP if not.
+
optional()
{
option=`echo "$OPTIONFLAGS" | egrep "(^|:)$1(:|\$)"`