From 569c6676a6ddb0ff73821d7693b5e18ddef809b9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 16 Oct 2014 22:51:35 -0400
Subject: Imported Upstream version 3.2.0

---
 test/shell2.test | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'test/shell2.test')

diff --git a/test/shell2.test b/test/shell2.test
index 8260932..def574c 100644
--- a/test/shell2.test
+++ b/test/shell2.test
@@ -42,7 +42,7 @@ sqlite3 db test.db
 # Reported on mailing list by Ken Zalewski.
 # Ticket [aeff892c57].
 do_test shell2-1.1.1 {
-  file delete -force foo.db
+  forcedelete foo.db
   set rc [ catchcmd "-batch foo.db" "CREATE TABLE t1(a);" ]
   set fexist [file exist foo.db]
   list $rc $fexist
@@ -81,7 +81,7 @@ do_test shell2-1.3 {
 # Test with echo off
 # NB. whitespace is important
 do_test shell2-1.4.1 {
-  file delete -force foo.db
+  forcedelete foo.db
   catchcmd "foo.db" {CREATE TABLE foo(a);
 INSERT INTO foo(a) VALUES(1);
 SELECT * FROM foo;}
@@ -90,7 +90,7 @@ SELECT * FROM foo;}
 # Test with echo on using command line option
 # NB. whitespace is important
 do_test shell2-1.4.2 {
-  file delete -force foo.db
+  forcedelete foo.db
   catchcmd "-echo foo.db" {CREATE TABLE foo(a);
 INSERT INTO foo(a) VALUES(1);
 SELECT * FROM foo;}
@@ -102,7 +102,7 @@ SELECT * FROM foo;
 # Test with echo on using dot command
 # NB. whitespace is important
 do_test shell2-1.4.3 {
-  file delete -force foo.db
+  forcedelete foo.db
   catchcmd "foo.db" {.echo ON
 CREATE TABLE foo(a);
 INSERT INTO foo(a) VALUES(1);
@@ -116,7 +116,7 @@ SELECT * FROM foo;
 # turning off mid- processing.
 # NB. whitespace is important
 do_test shell2-1.4.4 {
-  file delete -force foo.db
+  forcedelete foo.db
   catchcmd "foo.db" {.echo ON
 CREATE TABLE foo(a);
 .echo OFF
@@ -130,7 +130,7 @@ SELECT * FROM foo;}
 # multiple commands per line.
 # NB. whitespace is important
 do_test shell2-1.4.5 {
-  file delete -force foo.db
+  forcedelete foo.db
   catchcmd "foo.db" {.echo ON
 CREATE TABLE foo1(a);
 INSERT INTO foo1(a) VALUES(1);
@@ -155,13 +155,14 @@ SELECT * FROM foo1;
 2
 SELECT * FROM foo2;
 1
-2}}
+2
+}}
 
 # Test with echo on and headers on using dot command and 
 # multiple commands per line.
 # NB. whitespace is important
 do_test shell2-1.4.6 {
-  file delete -force foo.db
+  forcedelete foo.db
   catchcmd "foo.db" {.echo ON
 .headers ON
 CREATE TABLE foo1(a);
@@ -192,6 +193,7 @@ a
 SELECT * FROM foo2;
 b
 1
-2}}
+2
+}}
 
 finish_test
-- 
cgit v1.2.3