From d674342e2e29feb7dd3ccf44e2116f78e611e906 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 29 Sep 2022 12:42:00 +0100 Subject: tests/tcg: remove -f from Makefile invocation Instead of linking tests/tcg/Makefile.target into the build tree, name the symbolic link "Makefile" and create it in every target subdirectory. This makes it possible to just invoke "make" in tests/tcg subdirectories. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20220929114231.583801-21-alex.bennee@linaro.org> --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d454e089f3..2dc4217f19 100755 --- a/configure +++ b/configure @@ -2243,7 +2243,6 @@ fi # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. LINKS="Makefile" -LINKS="$LINKS tests/tcg/Makefile.target" LINKS="$LINKS pc-bios/optionrom/Makefile" LINKS="$LINKS pc-bios/s390-ccw/Makefile" LINKS="$LINKS pc-bios/vof/Makefile" @@ -2457,6 +2456,7 @@ fi echo "# Automatically generated by configure - do not modify" > $makefile config_host_mak=tests/tcg/config-host.mak +mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak @@ -2560,8 +2560,9 @@ for target in $target_list; do got_cross_cc=yes fi if test $got_cross_cc = yes; then - mkdir -p tests/tcg/$target - ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak + mkdir -p "tests/tcg/$target" + ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/Makefile" + ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak" echo "TARGET=$target" >> "$config_target_mak" echo "QEMU=$PWD/$qemu" >> "$config_target_mak" echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile -- cgit v1.2.3-55-g7522