remove qmtest-related Makefile targets

Message ID 20231205164151.27101-1-egallager@gcc.gnu.org
State Accepted
Headers
Series remove qmtest-related Makefile targets |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Eric Gallager Dec. 5, 2023, 4:41 p.m. UTC
  On GitHub, Joseph Myers (@jsm28 there) says in MentorEmbedded/qmtest#1
that the qmtest-related targets should have been removed long ago. This
patch does so.

Ref:
https://github.com/MentorEmbedded/qmtest/issues/1

gcc/ChangeLog:

	* Makefile.in: Remove qmtest-related targets.
---
 gcc/Makefile.in | 53 -------------------------------------------------
 1 file changed, 53 deletions(-)
  

Comments

Jeff Law Dec. 6, 2023, 5:56 p.m. UTC | #1
On 12/5/23 09:41, Eric Gallager wrote:
> On GitHub, Joseph Myers (@jsm28 there) says in MentorEmbedded/qmtest#1
> that the qmtest-related targets should have been removed long ago. This
> patch does so.
> 
> Ref:
> https://github.com/MentorEmbedded/qmtest/issues/1
> 
> gcc/ChangeLog:
> 
> 	* Makefile.in: Remove qmtest-related targets.
In hindsight I probably should have been more supportive of the QMTest 
effort.  But it's dead now.

OK for the trunk.

jeff
  
Eric Gallager Dec. 6, 2023, 6:43 p.m. UTC | #2
On Wed, Dec 6, 2023 at 12:56 PM Jeff Law <jeffreyalaw@gmail.com> wrote:
> On 12/5/23 09:41, Eric Gallager wrote:
> > On GitHub, Joseph Myers (@jsm28 there) says in MentorEmbedded/qmtest#1
> > that the qmtest-related targets should have been removed long ago. This
> > patch does so.
> >
> > Ref:
> > https://github.com/MentorEmbedded/qmtest/issues/1
> >
> > gcc/ChangeLog:
> >
> >       * Makefile.in: Remove qmtest-related targets.
> In hindsight I probably should have been more supportive of the QMTest
> effort.  But it's dead now.
>
> OK for the trunk.
>
> jeff

Thanks, committed as r14-6230-gec266cbb859160:
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ec266cbb859160aa207b6b292cfd974280ca8ff9
  

Patch

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index e154f7c0055..f80aa09ef74 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3733,7 +3733,6 @@  distclean: clean lang.distclean
 	-rm -f testsuite/*.log testsuite/*.sum
 	-cd testsuite && rm -f x *.x *.x? *.exe *.rpo *.o *.s *.S *.cc
 	-cd testsuite && rm -f *.out *.gcov *$(coverageexts)
-	-rm -rf ${QMTEST_DIR} stamp-qmtest
 	-rm -f .gdbinit configargs.h
 	-rm -f gcov.pod
 # Delete po/*.gmo only if we are not building in the source directory.
@@ -4415,58 +4414,6 @@  check-parallel-% : site.exp
 	  fi ; \
 	fi )
 
-# QMTest targets
-
-# The path to qmtest.
-QMTEST_PATH=qmtest
-
-# The flags to pass to qmtest.
-QMTESTFLAGS=
-
-# The flags to pass to "qmtest run".
-QMTESTRUNFLAGS=-f none --result-stream dejagnu_stream.DejaGNUStream
-
-# The command to use to invoke qmtest.
-QMTEST=${QMTEST_PATH} ${QMTESTFLAGS}
-
-# The tests (or suites) to run.
-QMTEST_GPP_TESTS=g++
-
-# The subdirectory of the OBJDIR that will be used to store the QMTest
-# test database configuration and that will be used for temporary
-# scratch space during QMTest's execution.
-QMTEST_DIR=qmtestsuite
-
-# Create the QMTest database configuration.
-${QMTEST_DIR} stamp-qmtest:
-	${QMTEST} -D ${QMTEST_DIR} create-tdb \
-	    -c gcc_database.GCCDatabase \
-	    -a srcdir=`cd ${srcdir}/testsuite && ${PWD_COMMAND}` && \
-	    $(STAMP) stamp-qmtest
-
-# Create the QMTest context file.
-${QMTEST_DIR}/context: stamp-qmtest
-	rm -f $@
-	echo "CompilerTable.languages=c cplusplus" >> $@
-	echo "CompilerTable.c_kind=GCC" >> $@
-	echo "CompilerTable.c_path=${objdir}/xgcc" >> $@
-	echo "CompilerTable.c_options=-B${objdir}/" >> $@
-	echo "CompilerTable.cplusplus_kind=GCC" >> $@
-	echo "CompilerTable.cplusplus_path=${objdir}/xg++" >> $@
-	echo "CompilerTable.cplusplus_options=-B${objdir}/" >> $@
-	echo "DejaGNUTest.target=${target_noncanonical}" >> $@
-
-# Run the G++ testsuite using QMTest.
-qmtest-g++: ${QMTEST_DIR}/context
-	cd ${QMTEST_DIR} && ${QMTEST} run ${QMTESTRUNFLAGS} -C context \
-	   -o g++.qmr ${QMTEST_GPP_TESTS}
-
-# Use the QMTest GUI.
-qmtest-gui: ${QMTEST_DIR}/context
-	cd ${QMTEST_DIR} && ${QMTEST} gui -C context
-
-.PHONY: qmtest-g++
-
 # Run Paranoia on real.cc.
 
 paranoia.o: $(srcdir)/../contrib/paranoia.cc $(CONFIG_H) $(SYSTEM_H) $(TREE_H)