Mercurial > gub

changeset 3589:1fbe14c0df28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'gub' of git+ssh://git.sv.gnu.org/srv/git/lilypond into gub
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 02 Jul 2007 13:22:27 +0200
parents 057d1f2e665a (current diff) f7eb4a33fa6d (diff)
children 82d630736bcb
files lilypond.make
diffstat 4 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/cross/gcc-core.py	Mon Jul 02 13:22:15 2007 +0200
+++ b/gub/specs/cross/gcc-core.py	Mon Jul 02 13:22:27 2007 +0200
@@ -6,7 +6,7 @@
 class Gcc_core (gcc.Gcc_from_source):
     def __init__ (self, settings):
         gcc.Gcc_from_source.__init__ (self, settings)
-        self.with_tarball (mirror=mirrors.gnu,
+        self.with_tarball (mirror=mirrors.gcc,
                            version='4.1.1', format='bz2', name='gcc')
     def get_build_dependencies (self):
         return gcc.Gcc.get_build_dependencies (self)
--- a/gub/specs/cross/gcc.py	Mon Jul 02 13:22:15 2007 +0200
+++ b/gub/specs/cross/gcc.py	Mon Jul 02 13:22:27 2007 +0200
@@ -7,7 +7,7 @@
 class Gcc (cross.CrossToolSpec):
     def __init__ (self, settings):
         cross.CrossToolSpec.__init__ (self, settings)
-        self.with_tarball (mirror=mirrors.gnu, version='4.1.1', format='bz2')
+        self.with_tarball (mirror=mirrors.gcc, version='4.1.1', format='bz2')
 
     def get_build_dependencies (self):
         return ['cross/binutils']
--- a/lilypond.make	Mon Jul 02 13:22:15 2007 +0200
+++ b/lilypond.make	Mon Jul 02 13:22:27 2007 +0200
@@ -96,7 +96,7 @@
 ## should be last, to incorporate changed VERSION file.
 	$(MAKE) update-versions
 
-all: native dist-check doc-build doc-export $(OTHER_PLATFORMS) print-success
+all: native dist-check doc-build test-output doc-export $(OTHER_PLATFORMS) print-success
 
 platforms: $(PLATFORMS)
 
@@ -265,8 +265,7 @@
 
 NATIVE_ROOT=$(NATIVE_TARGET_DIR)/gubfiles/installer-lilypond-$(LILYPOND_LOCAL_BRANCH)
 DOC_LOCK=$(NATIVE_ROOT).lock
-
-
+TEST_LOCK=$(NATIVE_ROOT).lock
 
 NATIVE_LILY_BUILD=$(NATIVE_TARGET_DIR)/gubfiles/build/lilypond-$(LILYPOND_LOCAL_BRANCH)
 NATIVE_LILY_SRC=$(NATIVE_TARGET_DIR)/gubfiles/src/lilypond-$(LILYPOND_LOCAL_BRANCH)
@@ -284,6 +283,7 @@
 
 SIGNATURE_FUNCTION=uploads/signatures/$(1).$(NATIVE_BUILD_COMMITTISH)
 
+
 doc: native doc-build
 
 doc-clean:
@@ -292,17 +292,25 @@
 doc-build:
 	$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-build cached-info-man-build
 
+test-output:
+	$(PYTHON) gub/with-lock.py --skip $(TEST_LOCK) $(MAKE) cached-test-output
+
 unlocked-doc-clean:
 	make -C $(NATIVE_TARGET_DIR)/gubfiles/build/lilypond-$(LILYPOND_LOCAL_BRANCH) \
 		DOCUMENTATION=yes web-clean
 	rm -f $(call SIGNATURE_FUNCTION,cached-doc-build)
 	rm -f $(call SIGNATURE_FUNCTION,cached-doc-export)
 
-cached-doc-build cached-dist-check cached-doc-export cached-info-man-build:
+cached-test-output cached-doc-build cached-dist-check cached-doc-export cached-info-man-build:
 	-mkdir uploads/signatures/
 	if test ! -f  $(call SIGNATURE_FUNCTION,$@) ; then \
 		$(MAKE) $(subst cached,unlocked,$@) \
 		&& touch $(call SIGNATURE_FUNCTION,$@) ; fi
+unlocked-test-output:
+	cd $(NATIVE_LILY_BUILD) && $(DOC_RELOCATION) \
+		make CPU_COUNT=$(LILYPOND_WEB_CPU_COUNT)  test
+	tar -C $(NATIVE_LILY_BUILD)/ \
+	    -cjf $(CWD)/uploads/lilypond-$(DIST_VERSION)-$(DOC_BUILDNUMBER).test-output.tar.bz2 input/regression/out-test/
 
 unlocked-doc-build:
 	$(GPKG) -p $(BUILD_PLATFORM) remove lilypond
--- a/test-lily/upload.py	Mon Jul 02 13:22:15 2007 +0200
+++ b/test-lily/upload.py	Mon Jul 02 13:22:27 2007 +0200
@@ -28,6 +28,7 @@
              'darwin-ppc',
              'darwin-x86',
              'documentation',
+             'test-output',
              'freebsd-x86',
 #             'freebsd6-x86',
 #             'linux-arm',
@@ -66,6 +67,7 @@
     'cygwin': 'tar.bz2',
 
     'documentation': 'tar.bz2',
+    'test-output': 'tar.bz2',
     }
 
 def system (c):
@@ -124,7 +126,8 @@
             src_dests.append ((os.path.abspath (bin),
                                '%(host)s/%(platform)s' % locals ()))
             
-        if platform != 'documentation' and os.path.exists (bin):
+        if (platform not in ('documentation', 'test-output')
+             and os.path.exists (bin)):
             branch = repo.branch
             hdr = pickle.load (open ('uploads/%(platform)s/lilypond-%(branch)s.%(platform)s.hdr' % locals ()))
             key = hdr['source_checksum']
@@ -134,7 +137,7 @@
             
             commitishes[key] = lst
         
-        if (platform != 'documentation'
+        if (platform not in ('documentation', 'test-output')
             and  not os.path.exists ('log/%s.test.pdf' % base)):
             print 'test result does not exist for %s' % base
             cmds.append ('python test-lily/test-binary.py %s'