From: drh Date: Fri, 4 Dec 2015 13:44:07 +0000 (+0000) Subject: Remove the dependence on "exec ls -U" from the vtabH.test module, as the -U X-Git-Tag: version-3.10.0~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28a6a1168b8352161035a10c8c459eae77187657;p=thirdparty%2Fsqlite.git Remove the dependence on "exec ls -U" from the vtabH.test module, as the -U option to "ls" is not universally available. FossilOrigin-Name: 4ecbc75b465533cf80e166a9d0879b9afd3fe2be --- diff --git a/manifest b/manifest index 88e6966481..00191f9fd0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Prevent\sa\ssegfault\son\sSolaris\sin\sthe\stest_fs.c\sdue\sto\sdifferences\sin\sthe\ndefinition\sof\sthe\sdirent\sobject. -D 2015-12-04T03:27:45.044 +C Remove\sthe\sdependence\son\s"exec\sls\s-U"\sfrom\sthe\svtabH.test\smodule,\sas\sthe\s-U\noption\sto\s"ls"\sis\snot\suniversally\savailable. +D 2015-12-04T13:44:07.797 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d @@ -1276,7 +1276,7 @@ F test/vtabC.test 4528f459a13136f982e75614d120aef165f17292 F test/vtabD.test 05b3f1d77117271671089e48719524b676842e96 F test/vtabE.test d5024aa42754962f6bb0afd261681686488e7afe F test/vtabF.test fd5ad376f5a34fe0891df1f3cddb4fe7c3eb077e -F test/vtabH.test 2803a8773d1017ac93bbec6900fc7c35bb56c1c3 +F test/vtabH.test f77296bbf55675b72817cc10fbbcb236ac986abf F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8 @@ -1408,7 +1408,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 8534a46c06601ad35b97caee442371f24c718d0f -R 3f397aa5ab8af4d521cc061fb2695078 +P 042738ad3b769ad70fd7603f928d5b94a952267d +R d4a001dfc820878042f471ef37d7e668 U drh -Z 11a613e2a3c9a8773b81f1dda236b457 +Z 2a98a6e0179300d3f1024c7c0c5f05bd diff --git a/manifest.uuid b/manifest.uuid index 0adeb79067..b3054dd7aa 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -042738ad3b769ad70fd7603f928d5b94a952267d \ No newline at end of file +4ecbc75b465533cf80e166a9d0879b9afd3fe2be \ No newline at end of file diff --git a/test/vtabH.test b/test/vtabH.test index 6034d95fa1..7973819bd1 100644 --- a/test/vtabH.test +++ b/test/vtabH.test @@ -125,7 +125,7 @@ if {1} { } return $res } else { - return [exec ls -U /] + return [string map {/ {}} [glob /*]] } } @@ -214,5 +214,3 @@ if {1} { finish_test - -