commit a5b195a1dcc252916f68cadb81163a47d8995ee3
author David Majnemer <david.majnemer@gmail.com> Sat Feb 14 01:35:12 2015 +0000
committer David Majnemer <david.majnemer@gmail.com> Sat Feb 14 01:35:12 2015 +0000
tree 6fd0ab86477d2a77778c391df234200c6412390e
parent 6866a3c6f4c6ac4c368f4292b6567e456646b07b

Revert "Revert r229082 for a bit, it caused PR22577."

This reverts commit r229123.  It was a red herring, the bug was present
without r229082.

llvm-svn: 229205

clang/test/Driver/cl-options.c

diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index bfd7f10..ba717f0 100644
--- a/clang/test/Driver/cl-options.c
+++ b/clang/test/Driver/cl-options.c
@@ -123,6 +123,12 @@
 // RUN: %clang_cl /vmg /vmm /vms -### -- %s 2>&1 | FileCheck -check-prefix=VMX %s
 // VMX: '/vms' not allowed with '/vmm'
 
+// RUN: %clang_cl /volatile:iso -### -- %s 2>&1 | FileCheck -check-prefix=VOLATILE-ISO %s
+// VOLATILE-ISO-NOT: "-fms-volatile"
+
+// RUN: %clang_cl /volatile:ms -### -- %s 2>&1 | FileCheck -check-prefix=VOLATILE-MS %s
+// VOLATILE-MS: "-fms-volatile"
+
 // RUN: %clang_cl /W0 -### -- %s 2>&1 | FileCheck -check-prefix=W0 %s
 // W0: -w