From 67361b3fcbd13d0ca74f4439e5a474a3867847b6 Mon Sep 17 00:00:00 2001
From: "shess@chromium.org"
 <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 12 Apr 2011 20:13:06 +0000
Subject: Cleanup SQLite 3.6.18 import.

Get things spic-n-span for converting to the amalgamation, then SQLite
3.7.x.

sqlite3Preload -> sqlite3_preload because in the amalgamation, sqlite3_ is the key bit to make sure things aren't marked static.

AFAICT, SQLite 3.6.18 was not imported correctly last time, throwing
up spurious deltas.  Re-import and re-apply patches.

Remove a bunch of Gears-related stuff.  Quite some time ago the
Chromium and Gears SQLite imports were brought into line, but they
were never fully shared.  Nowadays these are completely useless:
 - remove fts1 patches.
 - add a Chromium test to make sure fts1 doesn't sneak in.
 - drop the Symbian stuff.
 - drop database poisoning.

Pull out the WebDatabase patch into a patch file.  Move ICU shell
changes into a distinct patch file.  Pull out testing patches into a
separate test.patch.

BUG=71731
TEST=automated testing and watching closely.

Review URL: http://codereview.chromium.org/6823057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81296 0039d316-1c4b-4281-b951-d872f2087c98
---
 third_party/sqlite/src/test/fts.test          | 61 ---------------------------
 third_party/sqlite/src/test/fts1.test         | 61 ---------------------------
 third_party/sqlite/src/test/malloc_common.tcl |  0
 third_party/sqlite/src/test/quick.test        |  1 -
 third_party/sqlite/src/test/tester.tcl        |  0
 third_party/sqlite/src/test/thread_common.tcl |  0
 6 files changed, 123 deletions(-)
 delete mode 100644 third_party/sqlite/src/test/fts.test
 delete mode 100644 third_party/sqlite/src/test/fts1.test
 mode change 100755 => 100644 third_party/sqlite/src/test/malloc_common.tcl
 mode change 100755 => 100644 third_party/sqlite/src/test/tester.tcl
 mode change 100755 => 100644 third_party/sqlite/src/test/thread_common.tcl

(limited to 'third_party/sqlite/src/test')

diff --git a/third_party/sqlite/src/test/fts.test b/third_party/sqlite/src/test/fts.test
deleted file mode 100644
index 031f547..0000000
--- a/third_party/sqlite/src/test/fts.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-# This file runs the fts tests.
-#
-# $Id$
-
-proc lshift {lvar} {
-  upvar $lvar l
-  set ret [lindex $l 0]
-  set l [lrange $l 1 end]
-  return $ret
-}
-while {[set arg [lshift argv]] != ""} {
-  switch -- $arg {
-    -sharedpagercache {
-      sqlite3_enable_shared_cache 1
-    }
-    default {
-      set argv [linsert $argv 0 $arg]
-      break
-    }
-  }
-}
-
-set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-rename finish_test really_finish_test
-proc finish_test {} {}
-set ISQUICK 1
-
-set EXCLUDE {
-  fts.test
-  fts1.test
-  fts2.test
-}
-
-if {[sqlite3 -has-codec]} {
-  # lappend EXCLUDE \
-  #  conflict.test
-}
-
-foreach testfile [lsort -dictionary [glob $testdir/fts*.test]] {
-  set tail [file tail $testfile]
-  puts "test: $tail"
-  if {[lsearch -exact $EXCLUDE $tail]>=0} continue
-  source $testfile
-  catch {db close}
-  if {$sqlite_open_file_count>0} {
-    puts "$tail did not close all files: $sqlite_open_file_count"
-    incr nErr
-    lappend ::failList $tail
-  }
-}
-source $testdir/misuse.test
-
-set sqlite_open_file_count 0
-really_finish_test
diff --git a/third_party/sqlite/src/test/fts1.test b/third_party/sqlite/src/test/fts1.test
deleted file mode 100644
index 1ddb19f..0000000
--- a/third_party/sqlite/src/test/fts1.test
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-# This file runs the fts tests.
-#
-# $Id$
-
-proc lshift {lvar} {
-  upvar $lvar l
-  set ret [lindex $l 0]
-  set l [lrange $l 1 end]
-  return $ret
-}
-while {[set arg [lshift argv]] != ""} {
-  switch -- $arg {
-    -sharedpagercache {
-      sqlite3_enable_shared_cache 1
-    }
-    default {
-      set argv [linsert $argv 0 $arg]
-      break
-    }
-  }
-}
-
-set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-rename finish_test really_finish_test
-proc finish_test {} {}
-set ISQUICK 1
-
-set EXCLUDE {
-  fts.test
-  fts1.test
-  fts2.test
-}
-
-if {[sqlite3 -has-codec]} {
-  # lappend EXCLUDE \
-  #  conflict.test
-}
-
-foreach testfile [lsort -dictionary [glob $testdir/fts1*.test]] {
-  set tail [file tail $testfile]
-  puts "test: $tail"
-  if {[lsearch -exact $EXCLUDE $tail]>=0} continue
-  source $testfile
-  catch {db close}
-  if {$sqlite_open_file_count>0} {
-    puts "$tail did not close all files: $sqlite_open_file_count"
-    incr nErr
-    lappend ::failList $tail
-  }
-}
-source $testdir/misuse.test
-
-set sqlite_open_file_count 0
-really_finish_test
diff --git a/third_party/sqlite/src/test/malloc_common.tcl b/third_party/sqlite/src/test/malloc_common.tcl
old mode 100755
new mode 100644
diff --git a/third_party/sqlite/src/test/quick.test b/third_party/sqlite/src/test/quick.test
index 70b0eeb..def0d0e 100644
--- a/third_party/sqlite/src/test/quick.test
+++ b/third_party/sqlite/src/test/quick.test
@@ -59,7 +59,6 @@ set EXCLUDE {
   delete3.test
   fts3.test
   fts.test
-  fts1.test
   fts2.test
   fuzz.test
   fuzz3.test
diff --git a/third_party/sqlite/src/test/tester.tcl b/third_party/sqlite/src/test/tester.tcl
old mode 100755
new mode 100644
diff --git a/third_party/sqlite/src/test/thread_common.tcl b/third_party/sqlite/src/test/thread_common.tcl
old mode 100755
new mode 100644
-- 
cgit v1.1