From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 30 May 2006 07:36:54 +0000 (+0000)
Subject: I'm impatient.  I think this will fix a few more problems with the buildbots.
X-Git-Tag: v2.5b1~335
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b72cd321d06afb23affedda6674303971156497;p=python

I'm impatient.  I think this will fix a few more problems with the buildbots.
I'm not sure this is the best approach, but I can't think of anything better.
If this creates problems, feel free to revert, but I think it's safe and
should make things a little better.
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 566e5d4d9a..911470ba75 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -594,8 +594,17 @@ testuniversal:	all platform
 		$(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall
 
 
+# These two force rules are only used for buildbottest.
+#  - cleanup tries to cleanup after broken tests.
+#  - setup ensures that we are using the latest version of Modules/Setup.dist.
+forcecleanup:
+		-rm -rf $(srcdir)/@test*
+
+forcesetup:
+		cp $(srcdir)/Modules/Setup.dist $(srcdir)/Modules/Setup
+
 # Like testall, but with a single pass only
-buildbottest:	all platform
+buildbottest:	forcecleanup forcesetup all platform
 		$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall -rw
 
 QUICKTESTOPTS=	$(TESTOPTS) -x test_thread test_signal test_strftime \