diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-02 11:52:37 +0000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2018-11-05 13:23:46 -0500 |
| commit | 4b2ff65a1f33b6130bfd92a8aaf6289909af9d35 (patch) | |
| tree | 201c6d0906ac8d402d5ccbe5d6374dcfc6f9260f | |
| parent | 438c78dab75e3b9d1bc8da1d5401da77c84e27b7 (diff) | |
tests: Move tests/hex-loader-check-data/ to tests/data/hex-loader/
Currently tests/hex-loader-check-data contains data files used
by the hexloader-test, and configure individually symlinks those
data files into the build directory using a wildcard.
Using a wildcard like this is a bad idea, because if a new
data file is added, nothing causes configure to be rerun,
and so no symlink is added for the new file. This can cause
tests to spuriously fail when they can't find their data.
Instead, it's better to symlink an entire directory of
data files. We already have such a directory: tests/data.
Move the data files from tests/hex-loader-check-data/ to
tests/data/hex-loader/, and remove the unnecessary symlinking.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | tests/data/hex-loader/test.hex (renamed from tests/hex-loader-check-data/test.hex) | 0 | ||||
| -rw-r--r-- | tests/hexloader-test.c | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 98a1856afc..cfabc14b59 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1370,7 +1370,7 @@ Intel Hexadecimal Object File Loader M: Su Hang <suhang16@mails.ucas.ac.cn> S: Maintained F: tests/hexloader-test.c -F: tests/hex-loader-check-data/test.hex +F: tests/data/hex-loader/test.hex CHRP NVRAM M: Thomas Huth <thuth@redhat.com> @@ -7421,10 +7421,6 @@ for bios_file in \ do FILES="$FILES pc-bios/$(basename $bios_file)" done -for test_file in $(find $source_path/tests/hex-loader-check-data -type f) -do - FILES="$FILES tests/hex-loader-check-data$(echo $test_file | sed -e 's/.*hex-loader-check-data//')" -done mkdir -p $DIRS for f in $FILES ; do if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then diff --git a/tests/hex-loader-check-data/test.hex b/tests/data/hex-loader/test.hex index 008a90bd4d..008a90bd4d 100644 --- a/tests/hex-loader-check-data/test.hex +++ b/tests/data/hex-loader/test.hex diff --git a/tests/hexloader-test.c b/tests/hexloader-test.c index b653d44ba1..834ed52c22 100644 --- a/tests/hexloader-test.c +++ b/tests/hexloader-test.c @@ -23,7 +23,7 @@ static void hex_loader_test(void) const unsigned int base_addr = 0x00010000; QTestState *s = qtest_initf( - "-M vexpress-a9 -nographic -device loader,file=tests/hex-loader-check-data/test.hex"); + "-M vexpress-a9 -nographic -device loader,file=tests/data/hex-loader/test.hex"); for (i = 0; i < 256; ++i) { uint8_t val = qtest_readb(s, base_addr + i); |