diff mbox series

[toplevel] libctf: new testsuite

Message ID 20210105152510.60769-1-nick.alcock@oracle.com
State New
Headers show
Series [toplevel] libctf: new testsuite | expand

Commit Message

Nick Alcock Jan. 5, 2021, 3:25 p.m. UTC 
This enables 'make libctf-check', used by a new libctf testsuite in
binutils.

2021-01-05  Nick Alcock  <nick.alcock@oracle.com>

	* Makefile.def (libctf): No longer no_check.  Checking depends on
	all-ld.
	* Makefile.in: Regenerated.

---

 Makefile.def                                  |   4 +-
 Makefile.in                                   |  13 +

This is a stripped-down top-level-only subset of commit 
c59e30ed1727135f8efb79890f2c458f73709757 in binutils-gdb.git.  (Because
it is identical to what has already landed in binutils, it should apply
without trouble in syncs back to there.)

I don't have permission to push this: Alan has offered to do so.

(I hope I'm doing this right...)

Comments

Alan Modra Jan. 5, 2021, 10:53 p.m. UTC | #1 
On Tue, Jan 05, 2021 at 03:25:10PM +0000, Nick Alcock wrote:
> This enables 'make libctf-check', used by a new libctf testsuite in
> binutils.
> 
> 2021-01-05  Nick Alcock  <nick.alcock@oracle.com>
> 
> 	* Makefile.def (libctf): No longer no_check.  Checking depends on
> 	all-ld.
> 	* Makefile.in: Regenerated.
> 
> ---
> 
>  Makefile.def                                  |   4 +-
>  Makefile.in                                   |  13 +
> 
> This is a stripped-down top-level-only subset of commit 
> c59e30ed1727135f8efb79890f2c458f73709757 in binutils-gdb.git.  (Because
> it is identical to what has already landed in binutils, it should apply
> without trouble in syncs back to there.)
> 
> I don't have permission to push this: Alan has offered to do so.

It doesn't apply due to gcc missing binutils 87279e3cef5b2c5 changes
too.  I could fix that easily enough but I'm going to ask that you
post a combined patch to bring the gcc repo up to date with any libctf
changes.
Nick Alcock Jan. 6, 2021, 11:48 a.m. UTC | #2 
On 5 Jan 2021, Alan Modra via Binutils told this:

> It doesn't apply due to gcc missing binutils 87279e3cef5b2c5 changes
> too.  I could fix that easily enough but I'm going to ask that you
> post a combined patch to bring the gcc repo up to date with any libctf
> changes.

Oops! That never occurred to me, but of course all the earlier stuff is
probably missing too. Will come up with one once I've properly woken up.

(Sorry, I really should have tried to apply it :( )
diff mbox series

Patch

diff --git a/Makefile.def b/Makefile.def
index 089e70ae3ed..cc429aa8628 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -131,8 +131,7 @@  host_modules= { module= lto-plugin; bootstrap=true;
 		extra_make_flags='@extra_linker_plugin_flags@'; };
 host_modules= { module= libcc1; extra_configure_flags=--enable-shared; };
 host_modules= { module= gotools; };
-host_modules= { module= libctf; no_check=true;
-		bootstrap=true; };
+host_modules= { module= libctf; bootstrap=true; };
 
 target_modules = { module= libstdc++-v3;
 		   bootstrap=true;
@@ -547,6 +546,7 @@  dependencies = { module=configure-libctf; on=all-bfd; };
 dependencies = { module=configure-libctf; on=all-intl; };
 dependencies = { module=configure-libctf; on=all-zlib; };
 dependencies = { module=configure-libctf; on=all-libiconv; };
+dependencies = { module=check-libctf; on=all-ld; };
 
 // The Makefiles in gdb and gdbserver pull in a file that configure
 // generates in the gnulib directory, so distclean gnulib only after
diff --git a/Makefile.in b/Makefile.in
index fe34132f9e5..4fe7321786e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34761,6 +34761,12 @@  maybe-check-libctf:
 maybe-check-libctf: check-libctf
 
 check-libctf:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/libctf && \
+	  $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif libctf
 
@@ -52366,6 +52372,13 @@  configure-stage3-libctf: maybe-all-stage3-libiconv
 configure-stage4-libctf: maybe-all-stage4-libiconv
 configure-stageprofile-libctf: maybe-all-stageprofile-libiconv
 configure-stagefeedback-libctf: maybe-all-stagefeedback-libiconv
+check-libctf: maybe-all-ld
+check-stage1-libctf: maybe-all-stage1-ld
+check-stage2-libctf: maybe-all-stage2-ld
+check-stage3-libctf: maybe-all-stage3-ld
+check-stage4-libctf: maybe-all-stage4-ld
+check-stageprofile-libctf: maybe-all-stageprofile-ld
+check-stagefeedback-libctf: maybe-all-stagefeedback-ld
 distclean-gnulib: maybe-distclean-gdb
 distclean-gnulib: maybe-distclean-gdbserver
 all-bison: maybe-all-build-texinfo