| OLD | NEW |
| 1 Index: Makefile.linux-gcc | 1 Index: Makefile.linux-gcc |
| 2 =================================================================== | 2 =================================================================== |
| 3 --- Makefile.linux-gcc 2009-09-03 13:32:06.000000000 -0700 | 3 --- Makefile.linux-gcc 2009-09-03 13:32:06.000000000 -0700 |
| 4 +++ Makefile.linux-gcc 2009-07-01 12:08:39.000000000 -0700 | 4 +++ Makefile.linux-gcc 2009-07-01 12:08:39.000000000 -0700 |
| 5 @@ -14,7 +14,7 @@ | 5 @@ -14,7 +14,7 @@ |
| 6 #### The toplevel directory of the source tree. This is the directory | 6 #### The toplevel directory of the source tree. This is the directory |
| 7 # that contains this "Makefile.in" and the "configure.in" script. | 7 # that contains this "Makefile.in" and the "configure.in" script. |
| 8 # | 8 # |
| 9 -TOP = ../sqlite | 9 -TOP = ../sqlite |
| 10 +TOP = .. | 10 +TOP = .. |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 +# -DSQLITE_OMIT_VACUUM=1 \ | 51 +# -DSQLITE_OMIT_VACUUM=1 \ |
| 52 +# -DSQLITE_TRANSACTION_DEFAULT_IMMEDIATE=1 \ | 52 +# -DSQLITE_TRANSACTION_DEFAULT_IMMEDIATE=1 \ |
| 53 + | 53 + |
| 54 +SHELL_ICU = $(TOP)/src/shell_icu_linux.c -licuuc | 54 +SHELL_ICU = $(TOP)/src/shell_icu_linux.c -licuuc |
| 55 + | 55 + |
| 56 +# TODO(shess) I can't see why I need this setting. | 56 +# TODO(shess) I can't see why I need this setting. |
| 57 +OPTS += -DOS_UNIX=1 | 57 +OPTS += -DOS_UNIX=1 |
| 58 | 58 |
| 59 #### The suffix to add to executable files. ".exe" for windows. | 59 #### The suffix to add to executable files. ".exe" for windows. |
| 60 # Nothing for unix. | 60 # Nothing for unix. |
| 61 @@ -91,16 +112,16 @@ | 61 @@ -91,16 +111,16 @@ |
| 62 | 62 |
| 63 #### Extra compiler options needed for programs that use the TCL library. | 63 #### Extra compiler options needed for programs that use the TCL library. |
| 64 # | 64 # |
| 65 -#TCL_FLAGS = | 65 -#TCL_FLAGS = |
| 66 +TCL_FLAGS = -I/usr/include/tcl8.4 | 66 +TCL_FLAGS = -I/usr/include/tcl8.5 |
| 67 #TCL_FLAGS = -DSTATIC_BUILD=1 | 67 #TCL_FLAGS = -DSTATIC_BUILD=1 |
| 68 -TCL_FLAGS = -I/home/drh/tcltk/8.4linux | 68 -TCL_FLAGS = -I/home/drh/tcltk/8.5linux |
| 69 +#TCL_FLAGS = -I/home/drh/tcltk/8.4linux | 69 +#TCL_FLAGS = -I/home/drh/tcltk/8.5linux |
| 70 #TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1 | 70 #TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1 |
| 71 #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux | 71 #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux |
| 72 | 72 |
| 73 #### Linker options needed to link against the TCL library. | 73 #### Linker options needed to link against the TCL library. |
| 74 # | 74 # |
| 75 -#LIBTCL = -ltcl -lm -ldl | 75 -#LIBTCL = -ltcl -lm -ldl |
| 76 -LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl | 76 -LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl |
| 77 +LIBTCL = -ltcl8.4 -lm -ldl | 77 +LIBTCL = -ltcl8.5 -lm -ldl |
| 78 +#LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl | 78 +#LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl |
| 79 #LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt | 79 #LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt |
| 80 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc | 80 #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc |
| 81 | 81 |
| 82 Index: main.mk | 82 Index: main.mk |
| 83 =================================================================== | 83 =================================================================== |
| 84 --- main.mk 2009-09-10 12:18:17.000000000 -0700 | 84 --- main.mk 2009-09-10 12:18:17.000000000 -0700 |
| 85 +++ main.mk 2009-09-15 11:45:21.000000000 -0700 | 85 +++ main.mk 2009-09-15 11:45:21.000000000 -0700 |
| 86 @@ -69,6 +69,12 @@ | 86 @@ -69,6 +69,12 @@ |
| 87 walker.o where.o utf.o vtab.o | 87 walker.o where.o utf.o vtab.o |
| 88 | 88 |
| 89 | 89 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 @@ -484,6 +527,9 @@ | 128 @@ -484,6 +527,9 @@ |
| 129 test: testfixture$(EXE) sqlite3$(EXE) | 129 test: testfixture$(EXE) sqlite3$(EXE) |
| 130 ./testfixture$(EXE) $(TOP)/test/veryquick.test | 130 ./testfixture$(EXE) $(TOP)/test/veryquick.test |
| 131 | 131 |
| 132 +fts2test: testfixture$(EXE) sqlite3$(EXE) | 132 +fts2test: testfixture$(EXE) sqlite3$(EXE) |
| 133 + ./testfixture$(EXE) $(TOP)/test/fts2.test | 133 + ./testfixture$(EXE) $(TOP)/test/fts2.test |
| 134 + | 134 + |
| 135 sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \ | 135 sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \ |
| 136 $(TOP)/tool/spaceanal.tcl | 136 $(TOP)/tool/spaceanal.tcl |
| 137 sed \ | 137 sed \ |
| 138 Index: src/quick.test | 138 diff --git a/third_party/sqlite/src/test/permutations.test b/third_party/sqlite/ |
| 139 =================================================================== | 139 index 9c48d9a..283cebf 100644 |
| 140 --- test/quick.test» 2009-09-04 13:37:44.000000000 -0700 | 140 --- test/permutations.test |
| 141 +++ test/quick.test» 2009-09-15 11:34:54.000000000 -0700 | 141 +++ test/permutations.test |
| 142 @@ -58,6 +58,7 @@ | 142 @@ -96,6 +96,7 @@ if {$::tcl_platform(platform)!="unix"} { |
| 143 crash7.test | 143 set alltests [test_set $alltests -exclude { |
| 144 delete3.test | 144 all.test async.test quick.test veryquick.test |
| 145 fts3.test | 145 memleak.test permutations.test soak.test fts3.test |
| 146 + fts2.test | 146 + fts2.test |
| 147 fuzz.test | 147 mallocAll.test rtree.test |
| 148 fuzz3.test | 148 }] |
| 149 fuzz_malloc.test | 149 |
| OLD | NEW |