>From cb67060d5bbcc168df25919dab31257fcaca6e44 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 1 Feb 2011 13:28:30 +0100 Subject: [PATCH 2/6] canonicalize-lgpl: Use del instead of rm. Fixes aborting on initial cleanup. 2011-02-01 Jan Nieuwenhuizen * tests/test-canonicalize-lgpl.c (main)[__MINGW32__]: Use del instead of rm. Fixes aborting on initial cleanup. Test output without this fix: 13:00:24 address@hidden:~/vc/gnulib/mingw/build $ LANG= gltests/test-canonicalize-lgpl.exe wine: cannot find L"C:\\windows\\system32\\rm.exe" File not found test-canonicalize-lgpl.c:60: assertion failed [3]13:00:31 address@hidden:~/vc/gnulib/mingw/build --- ChangeLog | 5 +++++ tests/test-canonicalize-lgpl.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e847952..3d53946 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-02-01 Jan Nieuwenhuizen + * tests/test-canonicalize-lgpl.c (main)[__MINGW32__]: Use del + instead of rm. Fixes aborting on initial cleanup. + +2011-02-01 Jan Nieuwenhuizen + * gnulib-tool: Enable cross building. * HACKING: New file, also documenting cross building. diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c index 17cdff0..02b3411 100644 --- a/tests/test-canonicalize-lgpl.c +++ b/tests/test-canonicalize-lgpl.c @@ -56,8 +56,13 @@ main (void) any leftovers from a previous partial run. */ { int fd; +#ifndef __MINGW32__ ignore_value (system ("rm -rf " BASE " ise")); ASSERT (mkdir (BASE, 0700) == 0); +#else /* __MINGW32__ */ + ignore_value (system ("del /r /q " BASE " ise")); + fprintf (stderr, "mkdir:%d\n", mkdir (BASE, 0777)); // FIXME +#endif /* __MINGW32__ */ fd = creat (BASE "/tra", 0600); ASSERT (0 <= fd); ASSERT (close (fd) == 0); -- 1.7.1