Merge remote-tracking branch 'upstream/master' into testsuite

2015-07-11 12:44:06 +02:00
parent 1380c68cf3 50b0536222
commit 5ceffa1f70
5 changed files with 18 additions and 19 deletions
--- a/test/Makefile
+++ b/test/Makefile
@@ -11,10 +11,9 @@ endif

 ifdef CMD_EXE
  EXE := .exe
-  DEL = del /f $(subst /,\,$1)
+  DEL = -del /f $(subst /,\,$1)
  MKDIR = mkdir $(subst /,\,$1)
-  DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir))))
-  RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST)))
+  RMDIR = -rmdir /s /q $(subst /,\,$1)
 else
  EXE :=
  DEL = $(RM) $1