diff options
| author | David Howells <dhowells@redhat.com> | 2014-03-06 14:55:50 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-03-06 15:04:46 +0000 |
| commit | 9b23fcdf5337e79a73e8d5ff1519d92fb457c680 (patch) | |
| tree | 11eba18604b74a0b7999f04dd0d7c34fae354f85 | |
| parent | 8b5f9a7144c34e1073f7c4eb6c5d6a21b1e11663 (diff) | |
| download | keyutils-9b23fcdf5337e79a73e8d5ff1519d92fb457c680.tar.gz | |
TEST: Include version.inc.sh from prepare.inc.sh
Include version.inc.sh from prepare.inc.sh rather than toolbox.inc.sh so that
prepare.inc.sh can test for the presence of features.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | tests/prepare.inc.sh | 6 | ||||
| -rw-r--r-- | tests/toolbox.inc.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/prepare.inc.sh b/tests/prepare.inc.sh index 03ce2ff..b46940e 100644 --- a/tests/prepare.inc.sh +++ b/tests/prepare.inc.sh @@ -1,5 +1,9 @@ # preparation script for running keyring tests +# Find the relative path from pwd to the directory holding this file +includes=${BASH_SOURCE[0]} +includes=${includes%/*}/ + # --- need to run in own session keyring if [ "x`keyctl rdescribe @s | sed 's/.*;//'`" != "xRHTS/keyctl/$$" ] then @@ -41,3 +45,5 @@ else fi KEYUTILSVER=`expr "$KEYUTILSVER" : '.*keyutils-\([0-9.]*\).*'` + +. $includes/version.inc.sh diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh index cd444ac..945d193 100644 --- a/tests/toolbox.inc.sh +++ b/tests/toolbox.inc.sh @@ -10,10 +10,6 @@ # ############################################################################### -# Find the relative path from pwd to the directory holding this file -includes=${BASH_SOURCE[0]} -includes=${includes%/*}/ - echo === $OUTPUTFILE === endian=`file -L /proc/$$/exe` @@ -84,7 +80,6 @@ function toolbox_report_result() fi } -. $includes/version.inc.sh ############################################################################### # |