From fbf6136c78d1754501203449d0d16cef3ab25663 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 6 Feb 2019 13:48:04 +0000 Subject: [PATCH] Do not attempt to test the shell ".trace" command in SQLITE_OMIT_TRACE builds. FossilOrigin-Name: 3839e9098107604e1526c2b1e813c019607077dfe39d7eeb92f3466518dec3b1 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/shell4.test | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 8ef969d860..c40263b960 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\spreventing\stestfixture\sfrom\sbeing\sbuilt\swith\sSQLITE_OMIT_VIRTUALTABLE. -D 2019-02-06T13:41:19.971 +C Do\snot\sattempt\sto\stest\sthe\sshell\s".trace"\scommand\sin\sSQLITE_OMIT_TRACE\sbuilds. +D 2019-02-06T13:48:04.179 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4 @@ -1295,7 +1295,7 @@ F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 F test/shell1.test 0378c4e9e800da6fbb3c86c0c8f2cf5efc9e4155b4b6447d27dc71de648fc0a1 F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b F test/shell3.test ac8c2b744014c3e9a0e26bfd829ab65f00923dc1a91ffd044863e9423cc91494 -F test/shell4.test a6881d0ae226ded0df8ebdfa574c5aa6dc28d6884ccba1089dc56ed08b9e5ef4 +F test/shell4.test 1c6aef11daaa2d6830acaba3ac9cbec93fbc1c3d5530743a637f39b3987d08ce F test/shell5.test 23939a4c51f0421330ea61dbd3c74f9c215f5f8d3d1a94846da6ffc777a35458 F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3 F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f @@ -1804,7 +1804,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 3087a0c31e9fbfaedb7cf10a2fda59bc22318ff178614aefcc00ac83d9a7bb14 -R 8b56ce01d9688db09683490a688f55d6 +P d2cca36adc69d2c8e7707d70cbd75c497eae6a1a3f8a9dd18249ca6804c9db5f +R 0604b756261c3eacd605f066620218f1 U dan -Z 7f146451be4266c97b71a0741a05a13b +Z 4dc5274dec3f90959ac1ed51dd64dba8 diff --git a/manifest.uuid b/manifest.uuid index e96d093dc7..ed86f33908 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d2cca36adc69d2c8e7707d70cbd75c497eae6a1a3f8a9dd18249ca6804c9db5f \ No newline at end of file +3839e9098107604e1526c2b1e813c019607077dfe39d7eeb92f3466518dec3b1 \ No newline at end of file diff --git a/test/shell4.test b/test/shell4.test index 2210e74a67..386e51f6c7 100644 --- a/test/shell4.test +++ b/test/shell4.test @@ -106,6 +106,7 @@ SELECT 1; [regexp {Autoindex Inserts} $res] } {1 1 1} +ifcapable trace { do_test shell4-2.1 { catchcmd ":memory:" "CREATE TABLE t1(x);\n.trace --unknown" } {1 {Unknown option "--unknown" on ".trace"}} @@ -115,7 +116,6 @@ do_test shell4-2.2 { do_test shell4-2.3 { catchcmd ":memory:" ".trace stdout\n.dump\n.trace off\n" } {/^0 {PRAGMA.*}$/} -ifcapable trace { do_test shell4-2.4 { catchcmd ":memory:" ".trace stdout\nCREATE TABLE t1(x);SELECT * FROM t1;" } {0 {CREATE TABLE t1(x); -- 2.47.2