From e7e48dc629f2703f1130ee792705374f8b72622c Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 7 Aug 2019 18:34:21 +0000 Subject: [PATCH] Add "set TMP=%CD%" to the start of each msvc script output by releasetest_data.tcl. Otherwise, since binaries compiled with SQLITE_TEST all choose the same sequence of pseudo-random numbers, collisions between temp file names cause errors when running multiple tests in parallel. FossilOrigin-Name: f5d0436d8dc650cadb61a5fe76fd1a0d68dabba54ff0c2a8c138f9dfbdab1c3f --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/releasetest_data.tcl | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 397d866523..2eb7259b18 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Eliminate\ssome\smore\scases\sof\sredundant\ssorting\sin\swindow-function\squeries. -D 2019-08-07T17:45:37.981 +C Add\s"set\sTMP=%CD%"\sto\sthe\sstart\sof\seach\smsvc\sscript\soutput\sby\sreleasetest_data.tcl.\sOtherwise,\ssince\sbinaries\scompiled\swith\sSQLITE_TEST\sall\schoose\sthe\ssame\ssequence\sof\spseudo-random\snumbers,\scollisions\sbetween\stemp\sfile\snames\scause\serrors\swhen\srunning\smultiple\stests\sin\sparallel. +D 2019-08-07T18:34:21.690 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1245,7 +1245,7 @@ F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d F test/releasetest.tcl 968fc1e8fd23e113fb8a04379747f3a9f2c12d207b2de85aeff5a825962e1cd7 x -F test/releasetest_data.tcl 29b791054d86fbd7abca0a63c95b342d9af7b5f8768e905274dcb4f4be4599a5 +F test/releasetest_data.tcl 4f55292d7e3e7995754373612a16b71f41be22dfded3a0375ccaf65c465d3765 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa @@ -1838,7 +1838,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 193c87fc96f964984a144c1a4506ef9db033ab2b80e64dd4d09d820fef466407 -R cf8e896490e535b9c5c16cd5f2f5a730 +P 8158d2aca68c5a253054376fdf1b8eaab2db874f4b93524742be7340e9c50dd5 +R 072ac875b97aeb49fe07427245b5d6d5 U dan -Z 4641b29bc9e526bd7952f7ad9437097c +Z dd0b32346d93ef63ee23b8e92d055597 diff --git a/manifest.uuid b/manifest.uuid index 31ed0bd0e7..39bbbbc8ed 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8158d2aca68c5a253054376fdf1b8eaab2db874f4b93524742be7340e9c50dd5 \ No newline at end of file +f5d0436d8dc650cadb61a5fe76fd1a0d68dabba54ff0c2a8c138f9dfbdab1c3f \ No newline at end of file diff --git a/test/releasetest_data.tcl b/test/releasetest_data.tcl index 7782a7a8a8..638a45d555 100644 --- a/test/releasetest_data.tcl +++ b/test/releasetest_data.tcl @@ -546,6 +546,7 @@ proc main_script {args} { set makecmd "nmake /f %SRCDIR%\\Makefile.msc TOP=%SRCDIR% $target " append makecmd "\"CFLAGS=$cflags\" \"OPTS=$opts\" $makeOpts" + puts "set TMP=%CD%" puts $makecmd } }