batch-runner.js: move generated SQL files into ./sql and start adding hand-written ones (like the Mandelbrot) to that set.

FossilOrigin-Name: 06c106a7d23e4486dbed092757b7588688226ad35539ecc31378a8497f59d1ec

6 files changed, 40 insertions, 18 deletions

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 6a0835ece..1067018d4 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -289,18 +289,19 @@ all: $(sqlite3.js)
 
 ########################################################################
 # Bits for use with batch-runner.js...
+dir.sql := sql
 speedtest1 := ../../speedtest1
+speedtest1.sql := $(dir.sql)/speedtest1.sql
 $(speedtest1):
 	$(MAKE) -C ../.. speedtest1
-speedtest1.sql: $(speedtest1)
+$(speedtest1.sql): $(speedtest1)
 	$(speedtest1) --script $@
-speedtest1-000.sql:
-	echo "select 1;" > $@
-batch-runner.list: $(MAKEFILE) speedtest1.sql speedtest1-000.sql
-	bash split-speedtest1-script.sh speedtest1.sql
-	ls -1 *.sql | grep -v speedtest1.sql | sort > $@
-CLEAN_FILES += batch-runner.list speedtest1*.sql
+batch-runner.list: $(MAKEFILE) $(speedtest1.sql) $(dir.sql)/000-mandelbrot.sql
+	bash split-speedtest1-script.sh $(dir.sql)/speedtest1.sql
+	ls -1 $(dir.sql)/*.sql | grep -v speedtest1.sql | sort > $@
+CLEAN_FILES += batch-runner.list $(dir.sql)/speedtest1*.sql
 batch: batch-runner.list
+all: batch
 
 ########################################################################
 # fiddle_remote is the remote destination for the fiddle app. It
diff --git a/ext/wasm/batch-runner.js b/ext/wasm/batch-runner.js
index 0f5406f90..71171c323 100644
--- a/ext/wasm/batch-runner.js
+++ b/ext/wasm/batch-runner.js
@@ -119,7 +119,8 @@
       list.forEach(function(fn){
         if(!fn) return;
         opt = document.createElement('option');
-        opt.value = opt.innerText = fn;
+        opt.value = fn;
+        opt.innerText = fn.split('/').pop();
         sel.appendChild(opt);
       });
       this.logHtml("Loaded",infile);
diff --git a/ext/wasm/split-speedtest1-script.sh b/ext/wasm/split-speedtest1-script.sh
index e228a872e..e072d08a1 100755
--- a/ext/wasm/split-speedtest1-script.sh
+++ b/ext/wasm/split-speedtest1-script.sh
@@ -7,9 +7,11 @@ if [ x = "x${testnums}" ]; then
   echo "Could not parse any begin/end blocks out of $infile" 1>&2
   exit 1
 fi
+odir=${infile%%/*}
+if [ "$odir" = "$infile" ]; then odir="."; fi
 #echo testnums=$testnums
 for n in $testnums; do
-  ofile=$(printf "speedtest1-%03d.sql" $n)
+  ofile=$odir/$(printf "speedtest1-%03d.sql" $n)
   sed -n -e "/^-- begin test $n /,/^-- end test $n\$/p" $infile > $ofile
   echo -e "$n\t$ofile"
 done
diff --git a/ext/wasm/sql/000-mandelbrot.sql b/ext/wasm/sql/000-mandelbrot.sql
new file mode 100644
index 000000000..3aa5f5715
--- /dev/null
+++ b/ext/wasm/sql/000-mandelbrot.sql
@@ -0,0 +1,17 @@
+WITH RECURSIVE
+  xaxis(x) AS (VALUES(-2.0) UNION ALL SELECT x+0.05 FROM xaxis WHERE x<1.2),
+  yaxis(y) AS (VALUES(-1.0) UNION ALL SELECT y+0.1 FROM yaxis WHERE y<1.0),
+  m(iter, cx, cy, x, y) AS (
+    SELECT 0, x, y, 0.0, 0.0 FROM xaxis, yaxis
+    UNION ALL
+    SELECT iter+1, cx, cy, x*x-y*y + cx, 2.0*x*y + cy FROM m 
+     WHERE (x*x + y*y) < 4.0 AND iter<28
+  ),
+  m2(iter, cx, cy) AS (
+    SELECT max(iter), cx, cy FROM m GROUP BY cx, cy
+  ),
+  a(t) AS (
+    SELECT group_concat( substr(' .+*#', 1+min(iter/7,4), 1), '') 
+    FROM m2 GROUP BY cy
+  )
+SELECT group_concat(rtrim(t),x'0a') as Mandelbrot FROM a;
diff --git a/manifest b/manifest
index 97a8f1265..f8f5e73b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\s.timer\sscript\sentry\sfrom\sfiddle\sapp\sbecause\semscripten\shas\sremoved\sgetrusage(),\swhich\sbreaks\sthe\stimer.
-D 2022-08-30T09:51:24.863
+C batch-runner.js:\smove\sgenerated\sSQL\sfiles\sinto\s./sql\sand\sstart\sadding\shand-written\sones\s(like\sthe\sMandelbrot)\sto\sthat\sset.
+D 2022-08-30T10:04:08.374
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle db7a4602f043cf4a5e4135be3609a487f9f1c83f05778bfbdf93766be4541b96
 F ext/wasm/EXPORTED_RUNTIME_METHODS.fiddle a004bd5eeeda6d3b28d16779b7f1a80305bfe009dfc7f0721b042967f0d39d02
-F ext/wasm/GNUmakefile cabfbb177d16c550442313416698e66dde575df27177d4ca3ccece5a66b37de4
+F ext/wasm/GNUmakefile b5d1e285ed9814646e1fb12a27b7507aea2d7208ef76e486e1471c8aabac5226
 F ext/wasm/README.md e1ee1e7c321c6a250bf78a84ca6f5882890a237a450ba5a0649c7a8399194c52
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 77ef4bcf37e362b9ad61f9c175dfc0f1b3e571563fb311b96581cf422ee6a8ec
 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
@@ -490,7 +490,7 @@ F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
 F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa511ac009b27df982
 F ext/wasm/batch-runner.html e5c3edd4a6c9359f6d9e6c99cb5f87f09007d98fa1c705ed3efa370abcd4323e
-F ext/wasm/batch-runner.js 84a465acde760de81d0372415cce56737799876395a878c44a7d3ce5dfe29e39
+F ext/wasm/batch-runner.js e5b4b93b8008b2cc53694025042b7322267790063d1f0c96cf1b17e9d5a75c7d
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
@@ -510,7 +510,8 @@ F ext/wasm/scratchpad-opfs-main.js 69e960e9161f6412fd0c30f355d4112f1894d6609eb43
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
 F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
 F ext/wasm/scratchpad-opfs-worker2.js 5f2237427ac537b8580b1c659ff14ad2621d1694043eaaf41ae18dbfef2e48c0
-F ext/wasm/split-speedtest1-script.sh 7138e474122686fecb274d78050f9bee6525bc64b72ff1af39f6fc0753ccfc1f x
+F ext/wasm/split-speedtest1-script.sh a3e271938d4d14ee49105eb05567c6a69ba4c1f1293583ad5af0cd3a3779e205 x
+F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d82675bd63d9c2d97a15f0
 F ext/wasm/sqlite3-worker1-promiser.js 92b8da5f38439ffec459a8215775d30fa498bc0f1ab929ff341fc3dd479660b9
 F ext/wasm/sqlite3-worker1.js 0c1e7626304543969c3846573e080c082bf43bcaa47e87d416458af84f340a9e
 F ext/wasm/testing-worker1-promiser.html 6eaec6e04a56cf24cf4fa8ef49d78ce8905dde1354235c9125dca6885f7ce893
@@ -2012,8 +2013,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1aab9627983ef0f016b01f78564e79cf815ed14d4b1b6dc04ec627b96f1b2f70
-R 7a91cd8f075d71f1129b2c16dc0c7e0d
+P 9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01
+R 3fee411065930bf42f56509feb119f8a
 U stephan
-Z fa99287ead67c43b637178f52d6fe01b
+Z 41ba67db7a03bd9c0e2ce1f308cc01b3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ef13e5993..f8b12461b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9034f19ae50f196cc2b94478edfcc8d765b08bcf383166f6212b3522dea63c01
\ No newline at end of file
+06c106a7d23e4486dbed092757b7588688226ad35539ecc31378a8497f59d1ec
\ No newline at end of file