dist files and test fixes

diff --git a/Makefile.am b/Makefile.am
index 2e18838653097e6db609af10248f22a2c3e244d2..69c360ab8062fc700f1cb4dd2100204da136840a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,11 +87,15 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 
 include_HEADERS = src/wimlib.h
 
-EXTRA_DIST =                   \
-       build-aux/strip_fPIC.sh \
-       debian                  \
-       programs/install.cmd
-       tests/common_tests.sh
+EXTRA_DIST =                                   \
+       build-aux/strip_fPIC.sh                 \
+       debian                                  \
+       programs/install.cmd                    \
+       tests/common_tests.sh                   \
+       tests/security_descriptor_1.base64      \
+       tests/security_descriptor_1.bin         \
+       tests/security_descriptor_2.base64      \
+       tests/security_descriptor_2.bin
 
 pkgconfigdir   = @pkgconfigdir@
 pkgconfig_DATA = wimlib.pc

diff --git a/tests/test-imagex-capture_and_apply b/tests/test-imagex-capture_and_apply
index 0a53aee0bf3c93887273b35d2c2f66c95b0d9d73..5f1bc017e3a840ed8c1031a49ba82fe4d4e68de6 100755 (executable)
--- a/tests/test-imagex-capture_and_apply
+++ b/tests/test-imagex-capture_and_apply
@@ -123,7 +123,7 @@ msg() {
 cleanup
 init
 
-. common_tests.sh
+. $srcdir/tests/common_tests.sh
 
 # Make sure exclusion list works
 msg "Testing default capture configuration file"

diff --git a/tests/test-imagex-mount b/tests/test-imagex-mount
index 2317aa607b0211a5ddc8216420e7c4c980927053..1134abf338ff78641c87232133cadb265fdca16d 100755 (executable)
--- a/tests/test-imagex-mount
+++ b/tests/test-imagex-mount
@@ -266,7 +266,7 @@ do_test() {
        rm -rf tmp.orig/* tmp.apply/*
 }
 
-. common_tests.sh
+. $srcdir/tests/common_tests.sh
 
 cleanup