From 48d315eaebf839e09e6a5a6497ffcea5a429be09 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Wed, 23 Mar 2022 15:21:33 +0100 Subject: [PATCH] simplification regression segfault test --- .../bz428153-segfault-using-EXPLAIN/expected-3.26 | 11 ----------- .../bz428153-segfault-using-EXPLAIN/expected-3.34 | 11 ----------- .../bz428153-segfault-using-EXPLAIN/expected-3.6 | 13 ------------- .../bz428153-segfault-using-EXPLAIN/runtest.sh | 12 ------------ 4 files changed, 47 deletions(-) delete mode 100644 Regression/bz428153-segfault-using-EXPLAIN/expected-3.26 delete mode 100644 Regression/bz428153-segfault-using-EXPLAIN/expected-3.34 delete mode 100644 Regression/bz428153-segfault-using-EXPLAIN/expected-3.6 diff --git a/Regression/bz428153-segfault-using-EXPLAIN/expected-3.26 b/Regression/bz428153-segfault-using-EXPLAIN/expected-3.26 deleted file mode 100644 index ab52965..0000000 --- a/Regression/bz428153-segfault-using-EXPLAIN/expected-3.26 +++ /dev/null @@ -1,11 +0,0 @@ -addr opcode p1 p2 p3 p4 p5 comment ----- ------------- ---- ---- ---- ------------- -- ------------- -0 Init 0 7 0 00 Start at 7 -1 OpenRead 0 2 0 1 00 root=2 iDb=0; foo -2 Rewind 0 6 0 00 -3 Column 0 0 1 00 r[1]=foo.bar -4 ResultRow 1 1 0 00 output=r[1] -5 Next 0 3 0 01 -6 Halt 0 0 0 00 -7 Transaction 0 0 1 0 01 usesStmtJournal=0 -8 Goto 0 1 0 00 diff --git a/Regression/bz428153-segfault-using-EXPLAIN/expected-3.34 b/Regression/bz428153-segfault-using-EXPLAIN/expected-3.34 deleted file mode 100644 index 80a2527..0000000 --- a/Regression/bz428153-segfault-using-EXPLAIN/expected-3.34 +++ /dev/null @@ -1,11 +0,0 @@ -addr opcode p1 p2 p3 p4 p5 comment ----- ------------- ---- ---- ---- ------------- -- ------------- -0 Init 0 7 0 0 Start at 7 -1 OpenRead 0 2 0 1 0 root=2 iDb=0; foo -2 Rewind 0 6 0 0 -3 Column 0 0 1 0 r[1]=foo.bar -4 ResultRow 1 1 0 0 output=r[1] -5 Next 0 3 0 1 -6 Halt 0 0 0 0 -7 Transaction 0 0 1 0 1 usesStmtJournal=0 -8 Goto 0 1 0 0 diff --git a/Regression/bz428153-segfault-using-EXPLAIN/expected-3.6 b/Regression/bz428153-segfault-using-EXPLAIN/expected-3.6 deleted file mode 100644 index 195a8fc..0000000 --- a/Regression/bz428153-segfault-using-EXPLAIN/expected-3.6 +++ /dev/null @@ -1,13 +0,0 @@ -0|Trace|0|0|0||00| -1|Goto|0|9|0||00| -2|OpenRead|0|2|0|1|00| -3|Rewind|0|7|0||00| -4|Column|0|0|1||00| -5|ResultRow|1|1|0||00| -6|Next|0|4|0||01| -7|Close|0|0|0||00| -8|Halt|0|0|0||00| -9|Transaction|0|0|0||00| -10|VerifyCookie|0|1|0||00| -11|TableLock|0|2|0|foo|00| -12|Goto|0|2|0||00| diff --git a/Regression/bz428153-segfault-using-EXPLAIN/runtest.sh b/Regression/bz428153-segfault-using-EXPLAIN/runtest.sh index 8736b86..0e3f3c9 100755 --- a/Regression/bz428153-segfault-using-EXPLAIN/runtest.sh +++ b/Regression/bz428153-segfault-using-EXPLAIN/runtest.sh @@ -36,24 +36,12 @@ rlJournalStart rlAssertRpm $PACKAGE rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" rlRun "VER=`sqlite3 -version | cut -d' ' -f 1`" 0 "Checking SQLite version" # Check for version - rlRun "MAJOR=`echo $VER | cut -d'.' -f 1`" - rlRun "MINOR=`echo $VER | cut -d'.' -f 2`" rlPhaseEnd rlPhaseStartTest Testing rlAssertExists $TmpDir rlRun "sqlite3 $TmpDir/test.db 'create table foo (bar varchar(10));'" 0 "Creating DB and test table" # Just create a db with dumb table rlRun "sqlite3 $TmpDir/test.db 'explain select * from foo;' >$TmpDir/output" 0 "Executing EXPECT command" # Segfault reproducer - if [[ $MAJOR -ge 3 ]]; then - if [[ $MINOR -lt 26 ]]; then - rlRun "diff ./expected-3.6 $TmpDir/output" 0 "Extra-supported version: checking output sanity" - elif [[ $MINOR -lt 34 ]]; then - rlRun "diff ./expected-3.26 $TmpDir/output" 0 "Extra-supported version: checking output sanity" - else - rlRun "diff ./expected-3.34 $TmpDir/output" 0 "Extra-supported version: checking output sanity" - cat $TmpDir/output - fi - fi rlPhaseEnd rlPhaseStartCleanup Cleanup