>From dce78b34da0b5d1a765594d98d5776814098d7a2 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 1 Feb 2011 13:43:12 +0100 Subject: [PATCH 4/6] canonicalize-lgpl: Skip cleanup using remove. Fixes aborting on cleanups. 2011-02-01 Jan Nieuwenhuizen * tests/test-canonicalize-lgpl.c (main)[__MINGW32__]: Skip cleanup using remove. Fixes aborting on cleanups. We do an initial cleanup anyway. --- ChangeLog | 5 +++++ tests/test-canonicalize-lgpl.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fe66c9..94a9a6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-02-01 Jan Nieuwenhuizen + * tests/test-canonicalize-lgpl.c (main)[__MINGW32__]: Skip cleanup using + remove. Fixes aborting on cleanups. We do an initial cleanup anyway. + +2011-02-01 Jan Nieuwenhuizen + * tests/test-canonicalize-lgpl.c (main)[__MINGW32__]: Skip symlink tests. Fixes aborting on symlink tests. diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c index f80b55d..49f8643 100644 --- a/tests/test-canonicalize-lgpl.c +++ b/tests/test-canonicalize-lgpl.c @@ -103,7 +103,9 @@ main (void) ASSERT (errno == ENOENT); } -#ifndef __MINGW32__ +#ifdef __MINGW32__ + return 0; +#endif /* __MINGW32__ */ /* From here on out, tests involve symlinks. */ if (symlink (BASE "/ket", "ise") != 0) @@ -212,8 +214,6 @@ main (void) free (result2); } -#endif /* !__MINGW32__ */ - /* Cleanup. */ ASSERT (remove (BASE "/droot") == 0); ASSERT (remove (BASE "/plo") == 0); -- 1.7.1