summaryrefslogtreecommitdiffstats
path: root/third_party/sqlite/test.patch
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 20:47:24 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 20:47:24 +0000
commitfdd072ff1b52f405ed3c2b1cfb86c6e92e5018c1 (patch)
tree25148ebdaa0b4bc68c22acb4ac9ef75cb461c7a0 /third_party/sqlite/test.patch
parente7dfb84e096a8f14717b4150bdb66a01032e1efa (diff)
downloadchromium_src-fdd072ff1b52f405ed3c2b1cfb86c6e92e5018c1.zip
chromium_src-fdd072ff1b52f405ed3c2b1cfb86c6e92e5018c1.tar.gz
chromium_src-fdd072ff1b52f405ed3c2b1cfb86c6e92e5018c1.tar.bz2
Convert to SQLite amalgamation.
SQLite generally distributes using a script-generated "Giant file of stuff", called the amalgamation. It's apparently faster, due to more opportunities for optimization, but for Chromium the attraction is that we don't need as many patches to SQLite. Imports of future versions of SQLite should be simpler, so long as an Ubuntu box is available. BUG=71731 TEST=automated testing and watching closely. Review URL: http://codereview.chromium.org/6835006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite/test.patch')
-rw-r--r--third_party/sqlite/test.patch22
1 files changed, 2 insertions, 20 deletions
diff --git a/third_party/sqlite/test.patch b/third_party/sqlite/test.patch
index 28c98d3..70d857e 100644
--- a/third_party/sqlite/test.patch
+++ b/third_party/sqlite/test.patch
@@ -125,42 +125,24 @@ Index: main.mk
objects: $(LIBOBJ_ORIG)
-@@ -484,6 +527,12 @@
+@@ -484,6 +527,9 @@
test: testfixture$(EXE) sqlite3$(EXE)
./testfixture$(EXE) $(TOP)/test/veryquick.test
-+ftstest: testfixture$(EXE) sqlite3$(EXE)
-+ ./testfixture$(EXE) $(TOP)/test/fts.test
-+
+fts2test: testfixture$(EXE) sqlite3$(EXE)
+ ./testfixture$(EXE) $(TOP)/test/fts2.test
+
sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
$(TOP)/tool/spaceanal.tcl
sed \
-Index: src/test_autoext.c
-===================================================================
---- src/test_autoext.c 2009-09-03 13:32:06.000000000 -0700
-+++ src/test_autoext.c 2009-09-15 18:14:35.000000000 -0700
-@@ -17,7 +17,9 @@
- #include "sqlite3ext.h"
-
- #ifndef SQLITE_OMIT_LOAD_EXTENSION
-+#ifndef SQLITE_CORE
- static SQLITE_EXTENSION_INIT1
-+#endif
-
- /*
- ** The sqr() SQL function returns the square of its input value.
Index: src/quick.test
===================================================================
--- test/quick.test 2009-09-04 13:37:44.000000000 -0700
+++ test/quick.test 2009-09-15 11:34:54.000000000 -0700
-@@ -58,6 +58,8 @@
+@@ -58,6 +58,7 @@
crash7.test
delete3.test
fts3.test
-+ fts.test
+ fts2.test
fuzz.test
fuzz3.test