Merging r196045:

------------------------------------------------------------------------
r196045 | d0k | 2013-12-01 03:48:10 -0800 (Sun, 01 Dec 2013) | 3 lines

Reenable ms inline asm test.

LLVM r196044 should make it pass.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@196072 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 6 deletions

diff --git a/test/Sema/ms-inline-asm.c b/test/Sema/ms-inline-asm.c
index 1916d3463d..69f234e5e9 100644
--- a/test/Sema/ms-inline-asm.c
+++ b/test/Sema/ms-inline-asm.c
@@ -1,4 +1,4 @@
-// REQUIRES: disabled
+// REQUIRES: x86-64-registered-target
 // RUN: %clang_cc1 %s -triple x86_64-apple-darwin10 -fasm-blocks -Wno-microsoft -verify -fsyntax-only
 
 void t1(void) { 
@@ -13,22 +13,22 @@ void f() {
   }
   f();
   __asm {
-    mov eax, 1+=2 // expected-error 2 {{unknown token in expression}}
+    mov eax, 1+=2 // expected-error {{unknown token in expression}}
   }
   f();
   __asm {
-    mov eax, 1+++ // expected-error 2 {{unknown token in expression}}
+    mov eax, 1+++ // expected-error {{unknown token in expression}}
   }
   f();
   __asm {
-    mov eax, LENGTH bar // expected-error {{Unable to lookup expr!}}
+    mov eax, LENGTH bar // expected-error {{unable to lookup expression}}
   }
   f();
   __asm {
-    mov eax, SIZE bar // expected-error {{Unable to lookup expr!}}
+    mov eax, SIZE bar // expected-error {{unable to lookup expression}}
   }
   f();
   __asm {
-    mov eax, TYPE bar // expected-error {{Unable to lookup expr!}}
+    mov eax, TYPE bar // expected-error {{unable to lookup expression}}
   }
 }