[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.1.2-1-6-g484d433

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit 484d43394d0492cabdde49b6231615d9ae19e527
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Tue Jun 28 21:40:19 2011 +0200

    Disable tests using a DBus daemon

diff --git a/debian/changelog b/debian/changelog
index 65aebeb..0dfc653 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
 obus (1.1.2-2) unstable; urgency=low
 
-  * Add a timeout instead of disabling tests
+  * Disable all tests needing a working DBus daemon
   * Make the tests use a temporary directory as $HOME (Closes: #630322)
   * Force compilation as bytecode on architectures without native dynlink
     (Closes: #630320)
 
- -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Tue, 14 Jun 2011 15:37:50 +0200
+ -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Tue, 28 Jun 2011 21:39:32 +0200
 
 obus (1.1.2-1) unstable; urgency=low
 
diff --git a/debian/patches/0002-Add-a-timeout-to-tests.patch b/debian/patches/0002-Add-a-timeout-to-tests.patch
deleted file mode 100644
index c2511fd..0000000
--- a/debian/patches/0002-Add-a-timeout-to-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
-Date: Sat, 11 Jun 2011 23:38:24 +0200
-Subject: Add a timeout to tests
-
----
- tests/main.ml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tests/main.ml b/tests/main.ml
-index 8f34e8c..38d656d 100644
---- a/tests/main.ml
-+++ b/tests/main.ml
-@@ -33,7 +33,7 @@ let rec run_tests failures total = function
-       lwt () = title name in
-       begin
-         try_lwt
--          test ()
-+          Lwt_unix.with_timeout 30. test
-         with exn ->
-           lwt () = Lwt_io.printlf "test failed with: %s" (Printexc.to_string exn) in
-           lwt () = Lwt_io.printl (Printexc.get_backtrace ()) in
--- 
diff --git a/debian/patches/0002-Disable-the-tests-that-need-a-working-dbus-daemon.patch b/debian/patches/0002-Disable-the-tests-that-need-a-working-dbus-daemon.patch
new file mode 100644
index 0000000..3f3cb54
--- /dev/null
+++ b/debian/patches/0002-Disable-the-tests-that-need-a-working-dbus-daemon.patch
@@ -0,0 +1,33 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Date: Sat, 11 Jun 2011 23:38:24 +0200
+Subject: Disable the tests that need a working dbus daemon
+
+---
+ tests/main.ml |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/main.ml b/tests/main.ml
+index 8f34e8c..78dcacb 100644
+--- a/tests/main.ml
++++ b/tests/main.ml
+@@ -33,7 +33,7 @@ let rec run_tests failures total = function
+       lwt () = title name in
+       begin
+         try_lwt
+-          test ()
++          Lwt_unix.with_timeout 30. test
+         with exn ->
+           lwt () = Lwt_io.printlf "test failed with: %s" (Printexc.to_string exn) in
+           lwt () = Lwt_io.printl (Printexc.get_backtrace ()) in
+@@ -60,8 +60,8 @@ lwt () =
+   run_tests 0 0 [
+     "serialization", Test_serialization.test;
+     "string validation", Test_validation.test;
+-    "authentication", Test_auth.test;
++    (*"authentication", Test_auth.test;
+     "communication", Test_communication.test;
+-    "garbage collection", Test_gc.test;
++    "garbage collection", Test_gc.test;*)
+   ]
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 7bc7644..1fc4b46 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Fix-for-type-conv-2.3.0.patch
-0002-Add-a-timeout-to-tests.patch
+0002-Disable-the-tests-that-need-a-working-dbus-daemon.patch

-- 
obus packaging