Revision: 7290
http://sourceforge.net/p/ipcop/svn/7290
Author: owes
Date: 2014-03-06 06:44:41 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
Add patch from upstream to fix testsuite.
Modified Paths:
--------------
ipcop/trunk/lfs/DBD-SQLite
Added Paths:
-----------
ipcop/trunk/src/patches/DBD-SQLite-1.37_testsuite-fixes.patch
Modified: ipcop/trunk/lfs/DBD-SQLite
===================================================================
--- ipcop/trunk/lfs/DBD-SQLite 2014-03-06 06:28:19 UTC (rev 7289)
+++ ipcop/trunk/lfs/DBD-SQLite 2014-03-06 06:44:41 UTC (rev 7290)
@@ -82,6 +82,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_testsuite-fixes.patch
# DBD-SQLite-1.37 include sqlite-3.7.12.1 (as the test show when using
unmodified code)
# Use system libsqlite code like debian, fedora : less code, smaller
size
Added: ipcop/trunk/src/patches/DBD-SQLite-1.37_testsuite-fixes.patch
===================================================================
--- ipcop/trunk/src/patches/DBD-SQLite-1.37_testsuite-fixes.patch
(rev 0)
+++ ipcop/trunk/src/patches/DBD-SQLite-1.37_testsuite-fixes.patch
2014-03-06 06:44:41 UTC (rev 7290)
@@ -0,0 +1,56 @@
+From f8a45b96f62742351c06fd956a4965004df7226d Mon Sep 17 00:00:00 2001
+From: Kenichi Ishigaki <[email protected]>
+Date: Thu, 9 Jan 2014 02:30:37 +0900
+Subject: [PATCH] error messages have been slightly changed since 3.8.2
+
+---
+ t/07_error.t | 2 +-
+ t/39_foreign_keys.t | 4 ++--
+ t/rt_36838_unique_and_bus_error.t | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/t/07_error.t b/t/07_error.t
+index 68ea9ca..cf4fdb1 100644
+--- a/t/07_error.t
++++ b/t/07_error.t
+@@ -28,4 +28,4 @@ eval {
+ };
+ ok($@, 'Statement 2 generated an error');
+ is( $DBI::err, 19, '$DBI::err ok' );
+-like( $DBI::errstr, qr/column a is not unique/, '$DBI::errstr ok' );
++like( $DBI::errstr, qr/column a is not unique|UNIQUE constraint failed/,
'$DBI::errstr ok' );
+diff --git a/t/39_foreign_keys.t b/t/39_foreign_keys.t
+index b7632fc..fc15d89 100644
+--- a/t/39_foreign_keys.t
++++ b/t/39_foreign_keys.t
+@@ -49,7 +49,7 @@ ok insert_track(13, "My Way", 2);
+ # column (3) does not correspond to row in the artist table.
+
+ ok !insert_track(14, "Mr. Bojangles", 3);
+-ok $@ =~ qr/foreign key constraint failed/;
++ok $@ =~ qr/foreign key constraint failed/i;
+
+ # This succeeds because a NULL is inserted into trackartist. A
+ # corresponding row in the artist table is not required in this case.
+@@ -62,7 +62,7 @@ ok insert_track(14, "Mr. Bojangles", undef);
+ # artist table.
+
+ ok !update_track(3, "Mr. Bojangles");
+-ok $@ =~ /foreign key constraint failed/;
++ok $@ =~ /foreign key constraint failed/i;
+
+ # Insert the required row into the artist table. It is then possible
+ # to update the inserted row to set trackartist to 3 (since a
+diff --git a/t/rt_36838_unique_and_bus_error.t
b/t/rt_36838_unique_and_bus_error.t
+index 2c3a819..5a8aafe 100644
+--- a/t/rt_36838_unique_and_bus_error.t
++++ b/t/rt_36838_unique_and_bus_error.t
+@@ -17,4 +17,4 @@ $dbh->do("CREATE TABLE nums (num INTEGER UNIQUE)");
+ ok $dbh->do("INSERT INTO nums (num) VALUES (?)", undef, 1);
+
+ eval { $dbh->do("INSERT INTO nums (num) VALUES (?)", undef, 1); };
+-ok $@ =~ /column num is not unique/, $@; # should not be a bus error
++ok $@ =~ /column num is not unique|UNIQUE constraint failed/, $@; # should
not be a bus error
+--
+1.8.5.2
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
