monotone-commits-diffs
[Top][All Lists]
Advanced

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

[Monotone-commits-diffs] org.debian.monotone: a47c58f580e7dd246231c1b40d


From: code
Subject: [Monotone-commits-diffs] org.debian.monotone: a47c58f580e7dd246231c1b40d4044739c4c1b86
Date: Mon, 11 Mar 2013 21:54:23 +0100 (CET)

revision:            a47c58f580e7dd246231c1b40d4044739c4c1b86
date:                2009-04-07T00:46:44
author:              address@hidden
branch:              org.debian.monotone
changelog:
beginning prep of 0.43-2: fix for the mips and powerpc failures

manifest:
format_version "1"

new_manifest [d41ca2cc2017e618be5405f18df24d88784934a8]

old_revision [1276cf13fe434ed08df6766a4e0b22c9ddfc48dd]

add_file "patches/00upstream-fix-test-spawn-redirected-hook-helper.diff"
 content [b24e80fb31a3c7c5cc993bdbc304e19661ffec7a]

add_file "patches/series"
 content [60165b9a40ea66e79f8716a9f31f6999c957c530]

patch "changelog"
 from [579c2a6526ff86f068266aab26151adf5315f3ee]
   to [491ea84d67a01cb9b7ae7e41e22bcbdbdf424504]

patch "control"
 from [eb918563f5f73f924791144c69b05a63d1f3332b]
   to [7f11743edcf3a1230c1832adc94c898cd993f222]

patch "rules"
 from [185a683db905c4e0b4cdc48efec5d2f4ca3c10e4]
   to [e036629708781bf015fa5311c9e93f736cf74a9e]
============================================================
--- changelog	579c2a6526ff86f068266aab26151adf5315f3ee
+++ changelog	491ea84d67a01cb9b7ae7e41e22bcbdbdf424504
@@ -1,3 +1,11 @@
+monotone (0.43-2) unstable; urgency=low
+
+  * Using quilt for patches to upstream code.
+  * Backport upstream fix for unreliable test "spawn_redirected_hook_helper";
+    should fix FTBFS on powerpc and mips.
+
+ -- Zack Weinberg <address@hidden>  Mon, 06 Apr 2009 17:00:59 -0700
+
 monotone (0.43-1) unstable; urgency=low
 
   [ Zack Weinberg ]
============================================================
--- control	eb918563f5f73f924791144c69b05a63d1f3332b
+++ control	7f11743edcf3a1230c1832adc94c898cd993f222
@@ -6,7 +6,7 @@ Vcs-Browser: http://viewmtn.angrygoats.n
  Zack Weinberg <address@hidden>, Ludovic Brenta <address@hidden>
 Homepage: http://monotone.ca/
 Vcs-Browser: http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone
-Build-Depends: debhelper (>= 7), autotools-dev, po-debconf, patch,
+Build-Depends: debhelper (>= 7), autotools-dev, po-debconf, quilt, patch,
  libboost-dev (>= 1.34.1-2) | libboost1.35-dev | libboost1.37-dev,
  libz-dev, libbotan1.8-dev, libsqlite3-dev, libpcre3-dev, libidn11-dev,
  liblua5.1-0-dev, libpcre3-dev
============================================================
--- /dev/null	
+++ patches/00upstream-fix-test-spawn-redirected-hook-helper.diff	b24e80fb31a3c7c5cc993bdbc304e19661ffec7a
@@ -0,0 +1,88 @@
+Backport upstream fix for an unreliable test.
+
+ca9e27455b19faae0b4381613a18dec47a46b1de:
+|   tests/spawn_redirected_hook_helper: Wait for subprocess from within
+|   the hook, to eliminate a race with test directory cleanup.  Should
+|   eliminate the race described in comments for Windows (I think it's the
+|   same).  Fix what the hook does to be consistent across platforms.
+|
+1476420aff237c0c3f99a2eb295dffa1942b0e4b:
+|   Fix inconsistent line endings in 
+|   [tests/spawn_redirected_hook_helper/testhooks].
+
+Index: monotone-0.43/tests/spawn_redirected_hook_helper/__driver__.lua
+===================================================================
+--- monotone-0.43.orig/tests/spawn_redirected_hook_helper/__driver__.lua	2009-01-17 06:15:43.000000000 -0800
++++ monotone-0.43/tests/spawn_redirected_hook_helper/__driver__.lua	2009-04-06 16:54:49.606798740 -0700
+@@ -1,19 +1,10 @@
+-skip_if(ostype == "Windows")
+--- FIXME: this test broke on Windows when the change to running tests
+--- in parallel was made. There appears to be a race condition in
+--- waiting for the spawned test process; running under the debugger
+--- with breaks after the spawn but before the wait makes the test work.
+---
+--- FIXME: on top of that, the Lua mechanisms can't handle the error;
+--- win32/tester-plaf.cc run_tests_in_children returns status -1 to
+--- test_cleaner; that eventually gets passed to ldo.cc
+--- luaD_seterrorobj, which doesn't handle a status of -1, and
+--- tester.exe just exits. So xfail won't work here either.
+-
+ mtn_setup()
+ 
+ check(get("testhooks"))
+ 
+ check(raw_mtn("--rcfile=testhooks", "ls", "unknown"), 0, false, false)
++
+ skip_if(exists("skipfile"))
+ check(exists("outfile"))
++check(exists("errfile"))
++check(exists("tofile"))
+Index: monotone-0.43/tests/spawn_redirected_hook_helper/testhooks
+===================================================================
+--- monotone-0.43.orig/tests/spawn_redirected_hook_helper/testhooks	2009-01-17 06:15:43.000000000 -0800
++++ monotone-0.43/tests/spawn_redirected_hook_helper/testhooks	2009-04-06 16:55:17.795804329 -0700
+@@ -1,24 +1,30 @@
+ function ignore_file (name)
+   ok = true
++  if existsonpath("cp") == 0 then
++    pid = spawn_redirected ("", "", "errfile",
++    	  		    "cp", "testhooks", "tofile")
++    if pid == -1 then ok = false end
++  elseif existsonpath("xcopy") == 0 then
++    pid = spawn_redirected ("", "", "errfile",
++    	  		    "xcopy", "/q", "/y", "testhooks", "tofile")
++    if pid == -1 then ok = false end
++  else
++    ok = false
++    x = io.open("skipfile", "w")
++    x:close()
++  end
+ 
+   if ok then
+-    if existsonpath("touch") == 0 then
+-      pid = spawn_redirected ("", "", "xyzzy", "touch", "foofile")
+-      if pid == -1 then ok = false end
+-    elseif existsonpath("xcopy") == 0 then
+-      pid = spawn_redirected ("", "", "xyzzy", "xcopy")
+-      if pid == -1 then ok = false end
+-    else
+-      x = io.open("skipfile", "w")
+-      x:close()
+-    end
+-  end
+-  
++    res, ret = wait(pid)
++    if ret == -1 then ok = false end
++    if ret ~= 0 then ok = false end
++  end
++
+   if ok then
+     x = io.open("outfile", "w")
+-    x:close()
++    x:close()
+   end
+ 
+   ignore_file = function (name) return true end
+-return true
++  return true
+ end
============================================================
--- /dev/null	
+++ patches/series	60165b9a40ea66e79f8716a9f31f6999c957c530
@@ -0,0 +1 @@
+00upstream-fix-test-spawn-redirected-hook-helper.diff
============================================================
--- rules	185a683db905c4e0b4cdc48efec5d2f4ca3c10e4
+++ rules	e036629708781bf015fa5311c9e93f736cf74a9e
@@ -26,6 +26,8 @@ binary: binary-indep binary-arch
 build: build-arch
 binary: binary-indep binary-arch
 
+# patching
+include /usr/share/quilt/quilt.make
 
 # DEB_BUILD_OPTIONS handling
 
@@ -53,6 +55,7 @@ config.status: configure
 
 config.status: configure
 	dh_testdir
+	$(MAKE) -f debian/rules patch
 	[ -f config.sub.upstream ] || mv config.sub config.sub.upstream
 	[ -f config.guess.upstream ] || mv config.guess config.guess.upstream
 	cp -f /usr/share/misc/config.sub config.sub
@@ -78,6 +81,7 @@ clean:
 	dh_clean
 	[ ! -f config.sub.upstream ] || mv -f config.sub.upstream config.sub
 	[ ! -f config.guess.upstream ] || mv -f config.guess.upstream config.guess
+	$(MAKE) -f debian/rules unpatch
 
 
 # Architecture-dependent binary packages.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]