------------------------------------------------------------
revno: 760
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2007-06-27 09:54:06 +0200
message:
more smoketest fixes
modified:
rules
=== modified file 'rules'
--- a/rules 2007-06-26 17:06:26 +0000
+++ b/rules 2007-06-27 07:54:06 +0000
@@ -1151,12 +1151,19 @@
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
ifeq "$(RUN_SMOKETEST)" "y"
# smoketest
+ # apparently setting this here globally doesn't work, so hack around.
If we don't do this we get loads
+ # of harmless, but log-bloating warnings
+ if ! grep fakeroot $(SOURCE_TREE)/*.sh; then \
+ perl -pi -e
's,LD_LIBRARY_PATH=\"(.*)\",LD_LIBRARY_PATH=\"/usr/lib/libfakeroot:\1\",'
$(SOURCE_TREE)/*.sh; \
+ fi
cd $(SOURCE_TREE)/smoketestoo_native && \
mkdir -p $(CURDIR)/oosmoketest && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
+ export
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)"; \
export TEMP=$(CURDIR)/oosmoketest; \
- if test [ -n "$$DISPLAY" ]; then \
+ export SAL_IGNOREXERRORS=1; \
+ if [ -n "$$DISPLAY" ]; then \
../solenv/bin/build.pl; \
else \
xvfb-run -a ../solenv/bin/build.pl; \
