Update the vacuummem.test script so that it works on mac as well as on linux.

FossilOrigin-Name: ea7fb98b96f13f7dc5ed83ec5e8ad8857e20e06e

diff --git a/manifest b/manifest
index 6a45ebc22e752f64fa285064132dd9653d09c0ad..9cd5c96943b2395a53d2f9211200f696316ff21b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sboth\sMEMSYS3\sand\sMEMSYS5\sare\senabled,\sthan\sautomatically\sdisable\sMEMSYS3.
-D 2016-07-25T11:57:21.222
+C Update\sthe\svacuummem.test\sscript\sso\sthat\sit\sworks\son\smac\sas\swell\sas\son\slinux.
+D 2016-07-25T12:01:18.862
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -1324,7 +1324,7 @@ F test/vacuum.test ce91c39f7f91a4273bf620efad21086b5aa6ef1d
 F test/vacuum2.test aa048abee196c16c9ba308465494009057b79f9b
 F test/vacuum3.test 77ecdd54592b45a0bcb133339f99f1ae0ae94d0d
 F test/vacuum4.test d3f8ecff345f166911568f397d2432c16d2867d9
-F test/vacuummem.test ae20cc80a4960d3507d27cf0f2f4555988ceb6df
+F test/vacuummem.test e53a3fdca4612a99c515e1afe7934728a2383764
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test 765802c7a66d37fabd5ac8e2f2dbe572b43eb9ab
@@ -1507,7 +1507,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 5f40e6ad599eea59a5adc3a11d6f7998872736b4
-R b01daae186a7f9a051c9362d4aae0591
+P ccc22e14dc5d910d632807f49484be54dc2fde83
+R f8760ea1979a3d1e72e54c3ea906ea99
 U drh
-Z d2602db348bfa53fd2c4a084ddf1dc40
+Z 5b9cf50a9e82d7593d62c569e8fac940

diff --git a/manifest.uuid b/manifest.uuid
index 9bc4c35374290774434d08028040d23e048c0aee..9f906f5e5e0cf1138dd26bb3f2f69f4568e8bd60 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ccc22e14dc5d910d632807f49484be54dc2fde83
\ No newline at end of file
+ea7fb98b96f13f7dc5ed83ec5e8ad8857e20e06e
\ No newline at end of file

diff --git a/test/vacuummem.test b/test/vacuummem.test
index b0f5cf203865d49157216e3b5fc76bb96af77b28..b214c83b3d1bfb34fe2f5d46df44cd142649a9ad 100644 (file)
--- a/test/vacuummem.test
+++ b/test/vacuummem.test
@@ -41,18 +41,19 @@ do_execsql_test 1.0 {
   CREATE INDEX t1b ON t1(b);
   CREATE INDEX t1c ON t1(c);
 }
+set ans "#/[memory_used]/"
 
-do_test 1.1 { memory_used } {#/2300000/}
+do_test 1.1 { memory_used } $ans
 
 do_execsql_test 1.2 VACUUM
 
-do_test 1.3 { memory_used } {#/2300000/}
+do_test 1.3 { memory_used } $ans
 
 do_execsql_test 1.4 {
   SELECT count(*) FROM t1 WHERE +a IS NOT NULL
 } {100000}
 
-do_test 1.5 { memory_used } {#/2300000/}
+do_test 1.5 { memory_used } $ans