diff options
| author | David Howells <dhowells@redhat.com> | 2014-02-21 18:20:08 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-02-21 18:20:08 +0000 |
| commit | d1269f6b4eb8a358d8e1b182e83419271bbb9471 (patch) | |
| tree | 67eeb279ad09e5c2f7328b3ddbc9efcdf5e94bb3 | |
| parent | 9209a0c8fd63afc59f644e078b40cec531409c30 (diff) | |
| download | keyutils-d1269f6b4eb8a358d8e1b182e83419271bbb9471.tar.gz | |
TEST: Fix some miscellaneous bits
Fix some miscellaneous bits in the test suite:
(1) In makescript $(wild ...) isn't a make function, $(wildcard ...) should
be used instead.
(2) Emit more metadata.
(3) Remove a trailing blank line.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | tests/Makefile | 3 | ||||
| -rw-r--r-- | tests/toolbox.inc.sh | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index a31c00a..c948e07 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -52,7 +52,7 @@ clean: # Include Common Makefile -ifneq ($(wild /usr/share/rhts/lib/rhts-make.include),) +ifneq ($(wildcard /usr/share/rhts/lib/rhts-make.include),) include /usr/share/rhts/lib/rhts-make.include # Generate the testinfo.desc here: @@ -70,6 +70,7 @@ $(METADATA): Makefile @echo "Releases: -RHEL2.1 -RHEL3" >> $(METADATA) @echo "Type: Tier1" >> $(METADATA) @echo "Type: KernelTier1" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) rhts-lint $(METADATA) endif diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh index 16901a1..cbc49e0 100644 --- a/tests/toolbox.inc.sh +++ b/tests/toolbox.inc.sh @@ -1108,4 +1108,3 @@ function set_gc_delay() echo "Set $key_gc_delay_file to $delay, orig: $orig_gc_delay" fi } - |