Bug 397227 - Second attempt at fixing bustage on Linux leak test tinderbox, r=redness
authorJeff Walden <jwalden@mit.edu>
Thu, 04 Dec 2008 00:40:04 -0800
changeset 22275 01729bf2cbd446829c910093d8c369b634f5d1ed
parent 22274 f4d05bda478a8225862813e08aa7ddf11248ccb2
child 22276 7b0e6035060f4706821d708d2f0db32d018cf32b
push idunknown
push userunknown
push dateunknown
reviewersredness
bugs397227
milestone1.9.2a1pre
Bug 397227 - Second attempt at fixing bustage on Linux leak test tinderbox, r=redness
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -192,21 +192,17 @@ endif # XPCSHELL_TESTS
 ifdef CPP_UNIT_TESTS
 
 # Compile the tests to $(DIST)/bin.  Make lots of niceties available by default
 # through TestHarness.h, by modifying the list of includes and the libs against
 # which stuff links.
 CPPSRCS += $(CPP_UNIT_TESTS)
 SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
 REQUIRES += testing xpcom
-ifndef  MOZ_ENABLE_LIBXUL
-LIBS += $(XPCOM_LIBS) $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
-else
-LIBS += $(XPCOM_LIBS) $(XPCOM_STANDALONE_GLUE_LDOPTS) $(NSPR_LIBS)
-endif
+LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
 
 # ...and run them the usual way
 check::
 	@$(EXIT_ON_ERROR) \
 	  for f in $(subst .cpp,,$(CPP_UNIT_TESTS)); do \
 	    XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) $(DIST)/bin/$$f; \
 	  done