Bug 428326 - 'make check' fails when you've configured from a relative srcdir (e.g. ../src/configure), r=luser

This commit is contained in:
Benjamin Smedberg 2008-04-10 12:14:01 -04:00
Родитель a3951b7319
Коммит 36e6d8620d
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -151,6 +151,8 @@ else
getnativepath = $(1)
endif
abs_srcdir = $(shell cd $(srcdir) && pwd)
check::
@echo "Running TestVersionComparator tests"
@$(PERL) -w $(srcdir)/TestVersionComparatorRunner.pl "$(RUN_TEST_PROGRAM) $(FINAL_TARGET)/TestVersionComparator$(BIN_SUFFIX)"
@ -170,7 +172,7 @@ check::
echo "Scriptable object marked nonscriptable by xpidl"; \
exit 1; \
fi
@rm -f $(DIST)/bin/components/compreg.dat; \
regOrderDir="$(call getnativepath,${srcdir}/regorder)"; \
rm -f $(DIST)/bin/components/compreg.dat; \
regOrderDir="$(call getnativepath,$(abs_srcdir)/regorder)"; \
XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) \
$(DIST)/bin/TestRegistrationOrder$(BIN_SUFFIX) "$$regOrderDir"