[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 23/23: do not break on subsequentcheck for now



This is an automated email from the git hooks/post-receive script.

sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.

commit 96c30380e4fd1d38e01cf4c8ae86e715543b3315
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Nov 12 11:01:22 2013 +0100

    do not break on subsequentcheck for now
---
 rules |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules b/rules
index 8eadf54..ecd47d6 100755
--- a/rules
+++ b/rules
@@ -2804,9 +2804,10 @@ ifeq "$(BUILD_TEST_PACKAGE)" "y"
   ifeq "$(ENABLE_JUNIT4)" "y"
 	rm -rf $(PKGDIR)-subsequentcheckbase
 	mkdir -p $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/
-	for jar in OOoRunner.jar OOoRunnerLight.jar test.jar test-tools.jar; \
+	# FIXME: find all jars again
+	for jar in test-tools.jar; \
 	do \
-		cp `find solver -name $$jar` $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/; \
+		cp `find workdir -name $$jar` $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/; \
 	done
   endif
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: