In speedtest1, always use fatal_error() to exit fatally, instead of an fprintf/exit...

FossilOrigin-Name: 1bd15cb343f6ce57f108291a8ed0f3ee2046932591d44edec133fe3ea43a2ef0

diff --git a/manifest b/manifest
index ffe000267952492b8f38724a7a8c544daf63f545..e621f4d673b716e61586c0bd9dcad071e32ad055 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\swasm\sbuild\srefactoring.\sGet\sspeedtest1\sbuilding\sagain.
-D 2025-09-24T06:43:24.367
+C In\sspeedtest1,\salways\suse\sfatal_error()\sto\sexit\sfatally,\sinstead\sof\san\sfprintf/exit()\spair,\sso\sthat\sstdout/stderr\sget\sflushed\sconsistently\s(which\sis\ssignificant\sfor\sthe\sWASM\sbuild).
+D 2025-09-24T06:59:47.707
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1651,7 +1651,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
 F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad
 F test/speedtest.tcl 405411356fbc54af15987b7ffeec330a49138f71584220fb8fe1948b2f7ac907 x
-F test/speedtest1.c a9b002a7bfed99ba3166c2a9b8ae45a95b4c2d37f891e1637c022f9e1d15e3f9
+F test/speedtest1.c 6c01252e66f46de0b6b8d5316e03521e2151782104f3608c10262aa5dce85721
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2176,8 +2176,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a2935758f534b51cac3d2e5ece74b369c806e3a994781744708e1590b9c32542
-R acf4dcbfdb081e066471151e72df143c
+P 5434307dcd927686ce827da22de55020c4b431f888ac81ae3634d458ad0b563d
+R 210a5efe2316b682abbf20d611101f1a
 U stephan
-Z f6eb445351bec0a252beebd2cdc4d7bf
+Z e73e364b64b2fa236a8e0866f4233e8c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3b4ae24f328e656fc8a07f92e83c4358906ac44a..ecffa2808047e920b810794d803fb782bd367ea9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5434307dcd927686ce827da22de55020c4b431f888ac81ae3634d458ad0b563d
+1bd15cb343f6ce57f108291a8ed0f3ee2046932591d44edec133fe3ea43a2ef0

diff --git a/test/speedtest1.c b/test/speedtest1.c
index 968f2cb00bc9f8ac8400de794fd4ea6b166e80b1..a127f62e9fd8366ca782e923d7d299d95c9408b8 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -572,9 +572,8 @@ char *speedtest1_once(const char *zFormat, ...){
     }
     rc = sqlite3_reset(pStmt);
     if( rc!=SQLITE_OK ){
-      fprintf(stderr, "%s\nError code %d: %s\n",
-              sqlite3_sql(pStmt), rc, sqlite3_errmsg(g.db));
-      exit(1);
+      fatal_error("%s\nError code %d: %s\n",
+                  sqlite3_sql(pStmt), rc, sqlite3_errmsg(g.db));
     }
     sqlite3_finalize(pStmt);
   }
@@ -666,9 +665,8 @@ void speedtest1_run(void){
     sqlite3_prepare_v2(g.db, sqlite3_sql(g.pStmt), -1, &pNew, 0);
     rc = sqlite3_finalize(g.pStmt);
     if( rc!=SQLITE_OK ){
-      fprintf(stderr, "%s\nError code %d: %s\n",
-                      sqlite3_sql(pNew), rc, sqlite3_errmsg(g.db));
-      exit(1);
+      fatal_error("%s\nError code %d: %s\n",
+                  sqlite3_sql(pNew), rc, sqlite3_errmsg(g.db));
     }
     g.pStmt = pNew;
   }else
@@ -676,9 +674,8 @@ void speedtest1_run(void){
   {
     rc = sqlite3_reset(g.pStmt);
     if( rc!=SQLITE_OK ){
-      fprintf(stderr, "%s\nError code %d: %s\n",
-                      sqlite3_sql(g.pStmt), rc, sqlite3_errmsg(g.db));
-      exit(1);
+      fatal_error("%s\nError code %d: %s\n",
+                  sqlite3_sql(g.pStmt), rc, sqlite3_errmsg(g.db));
     }
   }
   speedtest1_shrink_memory();
@@ -2152,7 +2149,7 @@ void testset_rtree(int p1, int p2){
     }
     speedtest1_end_test();
   }
-  
+
   n = g.szTest*200;
   speedtest1_begin_test(120, "%d one-dimensional overlap slice queries", n);
   speedtest1_prepare("SELECT count(*) FROM rt1 WHERE y1>=?1 AND y0<=?2");
@@ -2181,7 +2178,6 @@ void testset_rtree(int p1, int p2){
     }
     speedtest1_end_test();
   }
-  
 
   n = g.szTest*200;
   speedtest1_begin_test(125, "%d custom geometry callback queries", n);