[DRE-commits] [SCM] ruby-fftw3.git branch, master, updated. debian/0.4-2-1-g7b7acc1

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 7b7acc1aa98ad48669eb9c7500926f11af596a80
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Jul 22 18:44:12 2011 +0900

    Fix test suite
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index 78ae48c..1486910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-fftw3 (0.4-3) unstable; urgency=low
+
+  * Refactoring test suite
+  * Add ruby-narray to Depends
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Fri, 22 Jul 2011 18:44:52 +0900
+
 ruby-fftw3 (0.4-2) unstable; urgency=low
 
   * Drop libnarray-rubyXX from Build-Depends
diff --git a/debian/control b/debian/control
index 65ea527..80c9088 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-Ruby-Versions: all
 
 Package: ruby-fftw3
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-narray
 Description: Ruby interface to the FFTW Ver.3 library
  Ruby-FFTW3 is the Ruby interface to the FFTW Ver.3 library.
  Features:
diff --git a/debian/patches/RefactTestCases b/debian/patches/RefactTestCases
index 043c5ea..9129b55 100644
--- a/debian/patches/RefactTestCases
+++ b/debian/patches/RefactTestCases
@@ -1,10 +1,9 @@
 --- ruby-fftw3.orig/test/complexFFT.rb
 +++ ruby-fftw3/test/complexFFT.rb
 @@ -1,38 +1,39 @@
--require "numru/fftw3"
-+$:.unshift(File.join(File.dirname(__FILE__), ".."))
 +require "test/unit"
-+require "fftw3"
++require "narray"
+ require "numru/fftw3"
  include NumRu
  
 -print "\n**TEST** all dimensions\n\n"
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
new file mode 100644
index 0000000..b3d366b
--- /dev/null
+++ b/debian/ruby-test-files.yaml
@@ -0,0 +1,2 @@
+---
+- test/complexFFT.rb
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index f4c2b1f..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1 +0,0 @@
-system("#{ENV['RUBY_TEST_BIN']} test/complexFFT.rb") or raise
diff --git a/test/complexFFT.rb b/test/complexFFT.rb
index 76f215b..39ae57e 100644
--- a/test/complexFFT.rb
+++ b/test/complexFFT.rb
@@ -1,6 +1,6 @@
-$:.unshift(File.join(File.dirname(__FILE__), ".."))
 require "test/unit"
-require "fftw3"
+require "narray"
+require "numru/fftw3"
 include NumRu
 
 class ComplexTest < Test::Unit::TestCase

-- 
ruby-fftw3.git