diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-16 12:41:09 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-16 12:42:26 +0100 |
| commit | 2fba9f257a39cc485701358a35eb11d526e3799a (patch) | |
| tree | de2d43820efa824ddc73b14e4a0fb6e29e1d7ef3 | |
| parent | 63916e0a990ef597bcb32b9e34f09c3cc4722cb2 (diff) | |
| download | msitools-2fba9f257a39cc485701358a35eb11d526e3799a.tar.gz msitools-2fba9f257a39cc485701358a35eb11d526e3799a.tar.xz msitools-2fba9f257a39cc485701358a35eb11d526e3799a.zip | |
tests: define AT_WIXLDATA in terms of AT_MSIDATA
| -rw-r--r-- | tests/testsuite.at | 2 | ||||
| -rw-r--r-- | tests/wixl.at | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at index bd3cc11..0751909 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -26,7 +26,7 @@ AT_INIT m4_define([AT_MSIDATA], [ dir=`dirname $1` AS_MKDIR_P([$dir]) -AT_CHECK([cp $abs_srcdir/tests/data/$1 $1])]) +AT_CHECK([cp $abs_srcdir/tests/data/$1 m4_default([$2], [$1])])]) # AT_DATA_UNQUOTED - define data file while allowing shell variables diff --git a/tests/wixl.at b/tests/wixl.at index f9babd9..d195a28 100644 --- a/tests/wixl.at +++ b/tests/wixl.at @@ -5,10 +5,7 @@ m4_define([AT_CHECK_WIXL], [ AT_CHECK([_wixl ]$@)]) # AT_WIXLDATA - copy data file from source tree -m4_define([AT_WIXLDATA], [ -dir=`dirname $1` -AS_MKDIR_P([$dir]) -AT_CHECK([cp $abs_srcdir/tests/data/wixl/$1 $1])]) +m4_define([AT_WIXLDATA], [AT_MSIDATA([wixl/$1], [m4_default([$2], [$1])])]) AT_SETUP([Invalid command line]) |