Enable some more tests on Windows.
FossilOrigin-Name: 72389c295bb240ec76746e289403b82e04189903
This commit is contained in:
parent
2744938e82
commit
99eef00d43
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
|||||||
C Fix\sharmless\scompiler\swarnings.
|
C Enable\ssome\smore\stests\son\sWindows.
|
||||||
D 2013-10-31T06:11:10.437
|
D 2013-10-31T06:13:57.969
|
||||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||||
F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
|
F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
|
||||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||||
@ -241,7 +241,7 @@ F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
|
|||||||
F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
|
F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
|
||||||
F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
|
F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
|
||||||
F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
|
F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
|
||||||
F src/test_config.c 3d148e338b575bd937f7746824f36a9c6682d238
|
F src/test_config.c e825cd6a4a8f498be246fc5934fe5fd702b9441f
|
||||||
F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
|
F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
|
||||||
F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
|
F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
|
||||||
F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
|
F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
|
||||||
@ -411,7 +411,7 @@ F test/crash4.test fe2821baf37168dc59dd733dcf7dba2a401487bc
|
|||||||
F test/crash5.test 05dd3aa9dbb751a22d5cdaf22a9c49b6667aa219
|
F test/crash5.test 05dd3aa9dbb751a22d5cdaf22a9c49b6667aa219
|
||||||
F test/crash6.test 4c56f1e40d0291e1110790a99807aa875b1647ba
|
F test/crash6.test 4c56f1e40d0291e1110790a99807aa875b1647ba
|
||||||
F test/crash7.test 1a194c4900a255258cf94b7fcbfd29536db572df
|
F test/crash7.test 1a194c4900a255258cf94b7fcbfd29536db572df
|
||||||
F test/crash8.test 38767cb504bbe491de6be4a7006b154973a2309f
|
F test/crash8.test 61442a9964ab6b124fc5254e4258b45747842e6f
|
||||||
F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
|
F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
|
||||||
F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
|
F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
|
||||||
F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
|
F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
|
||||||
@ -1126,7 +1126,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
|
|||||||
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
||||||
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
|
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
|
||||||
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
|
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
|
||||||
P 908e2c2124baece578e7a665f42b6b483b8f1d64
|
P 1a0a88657f54874703fc05f828ce29ad115d9f28
|
||||||
R 23ef143be49c0a216ae28708adaf378d
|
R 3ecce2c5ce21312a1dbb296432d69334
|
||||||
U mistachkin
|
U mistachkin
|
||||||
Z 3bcc2024c33f836e2f13b6cc80fcc85e
|
Z 202c1504aa0d2b90c6b0d6f25f8395e7
|
||||||
|
@ -1 +1 @@
|
|||||||
1a0a88657f54874703fc05f828ce29ad115d9f28
|
72389c295bb240ec76746e289403b82e04189903
|
@ -252,12 +252,7 @@ static void set_options(Tcl_Interp *interp){
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
Tcl_SetVar2(interp, "sqlite_options", "conflict", "1", TCL_GLOBAL_ONLY);
|
Tcl_SetVar2(interp, "sqlite_options", "conflict", "1", TCL_GLOBAL_ONLY);
|
||||||
|
|
||||||
#if SQLITE_OS_UNIX
|
|
||||||
Tcl_SetVar2(interp, "sqlite_options", "crashtest", "1", TCL_GLOBAL_ONLY);
|
Tcl_SetVar2(interp, "sqlite_options", "crashtest", "1", TCL_GLOBAL_ONLY);
|
||||||
#else
|
|
||||||
Tcl_SetVar2(interp, "sqlite_options", "crashtest", "0", TCL_GLOBAL_ONLY);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SQLITE_OMIT_DATETIME_FUNCS
|
#ifdef SQLITE_OMIT_DATETIME_FUNCS
|
||||||
Tcl_SetVar2(interp, "sqlite_options", "datetime", "0", TCL_GLOBAL_ONLY);
|
Tcl_SetVar2(interp, "sqlite_options", "datetime", "0", TCL_GLOBAL_ONLY);
|
||||||
|
112
test/crash8.test
112
test/crash8.test
@ -341,62 +341,68 @@ ifcapable pragma {
|
|||||||
} {jkl}
|
} {jkl}
|
||||||
}
|
}
|
||||||
|
|
||||||
for {set i 1} {$i < 10} {incr i} {
|
#
|
||||||
catch { db close }
|
# Since the following tests (crash8-5.*) rely upon being able
|
||||||
forcedelete test.db test.db-journal
|
# to copy a file while open, they will not work on Windows.
|
||||||
sqlite3 db test.db
|
#
|
||||||
do_test crash8-5.$i.1 {
|
if {$::tcl_platform(platform)=="unix"} {
|
||||||
execsql {
|
for {set i 1} {$i < 10} {incr i} {
|
||||||
CREATE TABLE t1(x PRIMARY KEY);
|
catch { db close }
|
||||||
INSERT INTO t1 VALUES(randomblob(900));
|
forcedelete test.db test.db-journal
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
sqlite3 db test.db
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
do_test crash8-5.$i.1 {
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
execsql {
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
CREATE TABLE t1(x PRIMARY KEY);
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
INSERT INTO t1 VALUES(randomblob(900));
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1; /* 64 rows */
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
}
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
crashsql -file test.db -delay [expr ($::i%2) + 1] {
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
PRAGMA cache_size = 10;
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
BEGIN;
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
UPDATE t1 SET x = randomblob(900);
|
INSERT INTO t1 SELECT randomblob(900) FROM t1; /* 64 rows */
|
||||||
ROLLBACK;
|
}
|
||||||
INSERT INTO t1 VALUES(randomblob(900));
|
crashsql -file test.db -delay [expr ($::i%2) + 1] {
|
||||||
}
|
PRAGMA cache_size = 10;
|
||||||
execsql { PRAGMA integrity_check }
|
BEGIN;
|
||||||
} {ok}
|
UPDATE t1 SET x = randomblob(900);
|
||||||
|
ROLLBACK;
|
||||||
|
INSERT INTO t1 VALUES(randomblob(900));
|
||||||
|
}
|
||||||
|
execsql { PRAGMA integrity_check }
|
||||||
|
} {ok}
|
||||||
|
|
||||||
catch { db close }
|
catch { db close }
|
||||||
forcedelete test.db test.db-journal
|
forcedelete test.db test.db-journal
|
||||||
sqlite3 db test.db
|
sqlite3 db test.db
|
||||||
do_test crash8-5.$i.2 {
|
do_test crash8-5.$i.2 {
|
||||||
execsql {
|
execsql {
|
||||||
PRAGMA cache_size = 10;
|
PRAGMA cache_size = 10;
|
||||||
CREATE TABLE t1(x PRIMARY KEY);
|
CREATE TABLE t1(x PRIMARY KEY);
|
||||||
INSERT INTO t1 VALUES(randomblob(900));
|
INSERT INTO t1 VALUES(randomblob(900));
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
INSERT INTO t1 SELECT randomblob(900) FROM t1;
|
||||||
INSERT INTO t1 SELECT randomblob(900) FROM t1; /* 64 rows */
|
INSERT INTO t1 SELECT randomblob(900) FROM t1; /* 64 rows */
|
||||||
BEGIN;
|
BEGIN;
|
||||||
UPDATE t1 SET x = randomblob(900);
|
UPDATE t1 SET x = randomblob(900);
|
||||||
}
|
}
|
||||||
forcedelete testX.db testX.db-journal testX.db-wal
|
forcedelete testX.db testX.db-journal testX.db-wal
|
||||||
forcecopy test.db testX.db
|
forcecopy test.db testX.db
|
||||||
forcecopy test.db-journal testX.db-journal
|
forcecopy test.db-journal testX.db-journal
|
||||||
db close
|
db close
|
||||||
|
|
||||||
crashsql -file test.db -delay [expr ($::i%2) + 1] {
|
crashsql -file test.db -delay [expr ($::i%2) + 1] {
|
||||||
SELECT * FROM sqlite_master;
|
SELECT * FROM sqlite_master;
|
||||||
INSERT INTO t1 VALUES(randomblob(900));
|
INSERT INTO t1 VALUES(randomblob(900));
|
||||||
}
|
}
|
||||||
|
|
||||||
sqlite3 db2 testX.db
|
sqlite3 db2 testX.db
|
||||||
execsql { PRAGMA integrity_check } db2
|
execsql { PRAGMA integrity_check } db2
|
||||||
} {ok}
|
} {ok}
|
||||||
|
}
|
||||||
|
catch {db2 close}
|
||||||
}
|
}
|
||||||
catch {db2 close}
|
|
||||||
|
|
||||||
finish_test
|
finish_test
|
||||||
|
Loading…
Reference in New Issue
Block a user