From: Florian Krohm <flo2030@eich-krohm.de>
Date: Wed, 1 Oct 2025 12:48:12 +0000 (+0000)
Subject: disasm-test: Makefile tweaks
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6abf08f96a97bf12aac01cef97ed39936eb038b3;p=thirdparty%2Fvalgrind.git

disasm-test: Makefile tweaks

disasm-test/Makefile.am: Include Makefile.tool-tests.am not Makefile.all.am

Also: do not build disasm-test on platforms other than s390x. There is no
point doing so as you won't be able to run it in a meaningful way.
---

diff --git a/Makefile.am b/Makefile.am
index a3150abb1..6c5b9f5b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,6 @@ SUBDIRS = \
 	perf \
 	gdbserver_tests \
 	memcheck/tests/vbit-test \
-	none/tests/s390x/disasm-test \
 	none/tests/iropt-test \
 	auxprogs \
 	mpi \
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 716ce000d..58e7a5249 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -24,7 +24,7 @@ if VGCONF_ARCHS_INCLUDE_ARM64
 SUBDIRS += arm64
 endif
 if VGCONF_ARCHS_INCLUDE_S390X
-SUBDIRS += s390x
+SUBDIRS += s390x s390x/disasm-test
 endif
 if VGCONF_ARCHS_INCLUDE_MIPS32
 SUBDIRS += mips32
diff --git a/none/tests/s390x/disasm-test/Makefile.am b/none/tests/s390x/disasm-test/Makefile.am
index 5629d7d52..150f38b32 100644
--- a/none/tests/s390x/disasm-test/Makefile.am
+++ b/none/tests/s390x/disasm-test/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/Makefile.all.am
+include $(top_srcdir)/Makefile.tool-tests.am
 
 EXTRA_DIST = disasm-test.vgtest disasm-test.stderr.exp \
              disasm-test.post.exp