commit 543cb4c333bb92f14752884df2bd9d5274db7218
author Hans Wennborg <hans@hanshq.net> Fri Nov 20 16:51:56 2015 +0000
committer Hans Wennborg <hans@hanshq.net> Fri Nov 20 16:51:56 2015 +0000
tree a4f6fa549f08bc6ccd4da552a53212c7a14f8dc0
parent 1311d29527cf0390a0daa90fc43b347b69f77c1a

Revert r253582: "clang-cl: Make /W4 imply -Wall -Wextra (PR25563)"

The patch expanded the flag *at the end*, breaking invocations like:

  clang-cl /W4 -Wno-unused-parameter

Reverting for now.

llvm-svn: 253678

clang/test/Driver/cl-options.c

diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index c21d104..180b15e 100644
--- a/clang/test/Driver/cl-options.c
+++ b/clang/test/Driver/cl-options.c
@@ -173,15 +173,10 @@
 // RUN: %clang_cl /W1 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s
 // RUN: %clang_cl /W2 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s
 // RUN: %clang_cl /W3 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s
+// RUN: %clang_cl /W4 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s
 // RUN: %clang_cl /Wall -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s
 // W1: -Wall
 
-// RUN: %clang_cl /W4 -### -- %s 2>&1 | FileCheck -check-prefix=W4 %s
-// W4: -Wextra
-// W4: -Wall
-// RUN: %clang_cl /W4 /W1 -### -- %s 2>&1 | FileCheck -check-prefix=W4W1 %s
-// W4W1-NOT: -Wextra
-
 // RUN: %clang_cl /WX -### -- %s 2>&1 | FileCheck -check-prefix=WX %s
 // WX: -Werror