Fossil SCM
Better clean-up after win32-longpath test. Revert accidental change in Makefile.mingw.
Commit
698a2d5968a9c6fa20fe44ba46519384164f533d
Parent
7d5c1bbd9c10134…
2 files changed
+6
-5
+2
-2
+6
-5
| --- test/win32-longpath.test | ||
| +++ test/win32-longpath.test | ||
| @@ -24,10 +24,11 @@ | ||
| 24 | 24 | ![catch { |
| 25 | 25 | fossil new $longpath/$x.fossil |
| 26 | 26 | }] |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -catch { | |
| 30 | - # If file deletion fails because your shell cannot | |
| 31 | - # handle that, you need to clean it up manually | |
| 32 | - exec "rm -rf [pwd]/$x" | |
| 33 | -} | |
| 29 | +# Try to remove the file/dir various ways, different | |
| 30 | +# Shells/Tcl versions expect it differently. | |
| 31 | +catch {file delete \\\\?\\$longpath\\$x.fossil} | |
| 32 | +catch {file delete $longpath/$x.fossil} | |
| 33 | +catch {file delete [pwd]/$x/$x.fossil} | |
| 34 | +catch {file delete [pwd]/$x} | |
| 34 | 35 |
| --- test/win32-longpath.test | |
| +++ test/win32-longpath.test | |
| @@ -24,10 +24,11 @@ | |
| 24 | ![catch { |
| 25 | fossil new $longpath/$x.fossil |
| 26 | }] |
| 27 | } |
| 28 | |
| 29 | catch { |
| 30 | # If file deletion fails because your shell cannot |
| 31 | # handle that, you need to clean it up manually |
| 32 | exec "rm -rf [pwd]/$x" |
| 33 | } |
| 34 |
| --- test/win32-longpath.test | |
| +++ test/win32-longpath.test | |
| @@ -24,10 +24,11 @@ | |
| 24 | ![catch { |
| 25 | fossil new $longpath/$x.fossil |
| 26 | }] |
| 27 | } |
| 28 | |
| 29 | # Try to remove the file/dir various ways, different |
| 30 | # Shells/Tcl versions expect it differently. |
| 31 | catch {file delete \\\\?\\$longpath\\$x.fossil} |
| 32 | catch {file delete $longpath/$x.fossil} |
| 33 | catch {file delete [pwd]/$x/$x.fossil} |
| 34 | catch {file delete [pwd]/$x} |
| 35 |
+2
-2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -13,15 +13,15 @@ | ||
| 13 | 13 | # |
| 14 | 14 | |
| 15 | 15 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | 17 | # |
| 18 | -# PREFIX = | |
| 18 | +PREFIX = | |
| 19 | 19 | # PREFIX = mingw32- |
| 20 | 20 | # PREFIX = i686-pc-mingw32- |
| 21 | 21 | # PREFIX = i686-w64-mingw32- |
| 22 | -PREFIX = x86_64-w64-mingw32- | |
| 22 | +# PREFIX = x86_64-w64-mingw32- | |
| 23 | 23 | |
| 24 | 24 | #### The toplevel directory of the source tree. Fossil can be built |
| 25 | 25 | # in a directory that is separate from the source tree. Just change |
| 26 | 26 | # the following to point from the build directory to the src/ folder. |
| 27 | 27 | # |
| 28 | 28 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -13,15 +13,15 @@ | |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | # |
| 18 | # PREFIX = |
| 19 | # PREFIX = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| 21 | # PREFIX = i686-w64-mingw32- |
| 22 | PREFIX = x86_64-w64-mingw32- |
| 23 | |
| 24 | #### The toplevel directory of the source tree. Fossil can be built |
| 25 | # in a directory that is separate from the source tree. Just change |
| 26 | # the following to point from the build directory to the src/ folder. |
| 27 | # |
| 28 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -13,15 +13,15 @@ | |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | # |
| 18 | PREFIX = |
| 19 | # PREFIX = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| 21 | # PREFIX = i686-w64-mingw32- |
| 22 | # PREFIX = x86_64-w64-mingw32- |
| 23 | |
| 24 | #### The toplevel directory of the source tree. Fossil can be built |
| 25 | # in a directory that is separate from the source tree. Just change |
| 26 | # the following to point from the build directory to the src/ folder. |
| 27 | # |
| 28 |