[DRE-commits] r4558 - in trunk/libnokogiri-ruby/debian: . patches

[Lucas Nussbaum]

Author: lucas
Date: 2010-01-19 14:14:21 +0000 (Tue, 19 Jan 2010)
New Revision: 4558

Added:
   trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.1.install.base
   trunk/libnokogiri-ruby/debian/patches/disable-rubygems.patch
Removed:
   trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.install.base
Modified:
   trunk/libnokogiri-ruby/debian/changelog
   trunk/libnokogiri-ruby/debian/patches/series
   trunk/libnokogiri-ruby/debian/rules
Log:
enable test suite

Modified: trunk/libnokogiri-ruby/debian/changelog
===================================================================
--- trunk/libnokogiri-ruby/debian/changelog	2010-01-19 13:22:07 UTC (rev 4557)
+++ trunk/libnokogiri-ruby/debian/changelog	2010-01-19 14:14:21 UTC (rev 4558)
@@ -1,8 +1,9 @@
 libnokogiri-ruby (1.4.0-2) unstable; urgency=low
 
   * Drop 1.9 package, add 1.9.1 package. Closes: #565825.
+  * Enable the test suite.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Tue, 19 Jan 2010 21:11:12 +1300
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 20 Jan 2010 03:09:56 +1300
 
 libnokogiri-ruby (1.4.0-1) unstable; urgency=low
 

Copied: trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.1.install.base (from rev 4541, trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.install.base)
===================================================================
--- trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.1.install.base	                        (rev 0)
+++ trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.1.install.base	2010-01-19 14:14:21 UTC (rev 4558)
@@ -0,0 +1 @@
+lib/* DIR

Deleted: trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.install.base
===================================================================
--- trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.install.base	2010-01-19 13:22:07 UTC (rev 4557)
+++ trunk/libnokogiri-ruby/debian/libnokogiri-ruby1.9.install.base	2010-01-19 14:14:21 UTC (rev 4558)
@@ -1 +0,0 @@
-lib/* DIR

Added: trunk/libnokogiri-ruby/debian/patches/disable-rubygems.patch
===================================================================
--- trunk/libnokogiri-ruby/debian/patches/disable-rubygems.patch	                        (rev 0)
+++ trunk/libnokogiri-ruby/debian/patches/disable-rubygems.patch	2010-01-19 14:14:21 UTC (rev 4558)
@@ -0,0 +1,19 @@
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,6 +1,5 @@
+ #Process.setrlimit(Process::RLIMIT_CORE, Process::RLIM_INFINITY) unless RUBY_PLATFORM =~ /(java|mswin|mingw)/i
+ $VERBOSE = true
+-require 'rubygems'
+ require 'test/unit'
+ require 'fileutils'
+ require 'tempfile'
+--- a/test/test_memory_leak.rb
++++ b/test/test_memory_leak.rb
+@@ -8,7 +8,6 @@ class TestMemoryLeak < Nokogiri::TestCas
+       begin
+         #  we don't use Dike in any tests, but requiring it has side effects
+         #  that can create memory leaks, and that's what we're testing for.
+-        require 'rubygems'
+         require 'dike' # do not remove!
+ 
+         count_start = count_object_space_documents

Modified: trunk/libnokogiri-ruby/debian/patches/series
===================================================================
--- trunk/libnokogiri-ruby/debian/patches/series	2010-01-19 13:22:07 UTC (rev 4557)
+++ trunk/libnokogiri-ruby/debian/patches/series	2010-01-19 14:14:21 UTC (rev 4558)
@@ -1 +1,2 @@
 get-rid-of-annoying-warning.patch
+disable-rubygems.patch

Modified: trunk/libnokogiri-ruby/debian/rules
===================================================================
--- trunk/libnokogiri-ruby/debian/rules	2010-01-19 13:22:07 UTC (rev 4557)
+++ trunk/libnokogiri-ruby/debian/rules	2010-01-19 14:14:21 UTC (rev 4558)
@@ -8,5 +8,16 @@
 DEB_RUBY_SETUP_CMD = ext/nokogiri/extconf.rb
 DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG.rdoc
 
-build/libnokogiri-ruby1.9::
-	sed "s,DIR,$(DEB_RUBY_LIBDIR),g" debian/libnokogiri-ruby1.9.install.base > debian/libnokogiri-ruby1.9.install
+build/libnokogiri-ruby1.9.1::
+	sed "s,DIR,$(DEB_RUBY_LIBDIR),g" debian/libnokogiri-ruby1.9.1.install.base > debian/libnokogiri-ruby1.9.1.install
+
+install/libnokogiri-ruby1.8::
+	ln -s $$(pwd)/nokogiri.so lib/nokogiri/nokogiri.so
+	ruby1.8 -Itest/ $$(find test/ -name 'test_*rb' -printf '-r%p ') < /dev/null
+	rm -f lib/nokogiri/nokogiri.so
+
+
+install/libnokogiri-ruby1.9.1::
+	ln -s $$(pwd)/nokogiri.so lib/nokogiri/nokogiri.so
+	ruby1.9.1 -Itest/ $$(find test/ -name 'test_*rb' -printf '-r%p ') < /dev/null
+	rm -f lib/nokogiri/nokogiri.so