9 files changed, 23 insertions, 8 deletions
diff --git a/test/CXX/class/class.nested.type/p1.cpp b/test/CXX/class/class.nested.type/p1.cpp
index 33bf4b4473..61ccd281ca 100644
--- a/test/CXX/class/class.nested.type/p1.cpp
+++ b/test/CXX/class/class.nested.type/p1.cpp
@@ -1,3 +1,5 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
 class X {
 public:
   typedef int I;
@@ -8,4 +10,4 @@ public:
 I b; // expected-error{{unknown type name 'I'}}
 Y c; // expected-error{{unknown type name 'Y'}}
 X::Y d;
-X::I e;
-\ No newline at end of file
+X::I e;
diff --git a/test/CXX/temp/temp.param/p1.cpp b/test/CXX/temp/temp.param/p1.cpp
index 488c3a0742..a6638b4f60 100644
--- a/test/CXX/temp/temp.param/p1.cpp
+++ b/test/CXX/temp/temp.param/p1.cpp
@@ -1 +1,4 @@
+// Suppress 'no run line' failure.
+// RUN: true
+
 // Paragraph 1 is descriptive, and therefore requires no tests.
diff --git a/test/Index/t1.c b/test/Index/t1.c
index d6ca995604..8b57a58b45 100644
--- a/test/Index/t1.c
+++ b/test/Index/t1.c
@@ -24,3 +24,6 @@ void field_test(void) {
   struct MyStruct ms;
   ms.field_var = 10;
 }
+
+// Suppress 'no run line' failure.
+// RUN: true
diff --git a/test/Index/t2.c b/test/Index/t2.c
index 76d5d6ceeb..bf52869ec8 100644
--- a/test/Index/t2.c
+++ b/test/Index/t2.c
@@ -9,3 +9,6 @@ void bar_func(void) {
   struct MyStruct *ms;
   ms->field_var = 10;
 }
+
+// Suppress 'no run line' failure.
+// RUN: true
diff --git a/test/Sema/attr-format_arg.c b/test/Sema/attr-format_arg.c
index 6f953155f8..0830951acc 100644
--- a/test/Sema/attr-format_arg.c
+++ b/test/Sema/attr-format_arg.c
@@ -1,3 +1,5 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
 #include <stdio.h>
 
 const char* f(const char *s) __attribute__((format_arg(1)));
diff --git a/test/SemaCXX/decltype-crash.cpp b/test/SemaCXX/decltype-crash.cpp
index c16422e1ba..b56a7f6029 100644
--- a/test/SemaCXX/decltype-crash.cpp
+++ b/test/SemaCXX/decltype-crash.cpp
@@ -1,5 +1,7 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
 int& a();
 
 void f() {
-  decltype(a()) c;
+  decltype(a()) c; // expected-error {{no matching function for call to 'decltype'}}
 }
diff --git a/test/SemaTemplate/instantiate-function-1.mm b/test/SemaTemplate/instantiate-function-1.mm
index aef2d9dbb7..be995e7ff6 100644
--- a/test/SemaTemplate/instantiate-function-1.mm
+++ b/test/SemaTemplate/instantiate-function-1.mm
@@ -1,3 +1,6 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+// XFAIL
+
 template<typename T> struct Member0 {
   void f(T t) {
     t;
diff --git a/utils/test/MultiTestRunner.py b/utils/test/MultiTestRunner.py
index dcf9d89ebb..5986cd927b 100755
--- a/utils/test/MultiTestRunner.py
+++ b/utils/test/MultiTestRunner.py
@@ -95,8 +95,6 @@ class TestingProgressDisplay:
         extra = ''
         if tr.code==TestStatus.Invalid:
             extra = ' - (Invalid test)'
-        elif tr.code==TestStatus.NoRunLine:
-            extra = ' - (No RUN line)'
         elif tr.failed():
             extra = ' - %s'%(TestStatus.getName(tr.code).upper(),)
         print '%*d/%*d - %s%s'%(self.digits, index+1, self.digits, 
diff --git a/utils/test/TestRunner.py b/utils/test/TestRunner.py
index 3b2b5eb7cc..ba43330d9a 100755
--- a/utils/test/TestRunner.py
+++ b/utils/test/TestRunner.py
@@ -33,10 +33,9 @@ class TestStatus:
     XFail = 1
     Fail = 2
     XPass = 3
-    NoRunLine = 4 
-    Invalid = 5
+    Invalid = 4
 
-    kNames = ['Pass','XFail','Fail','XPass','NoRunLine','Invalid']
+    kNames = ['Pass','XFail','Fail','XPass','Invalid']
     @staticmethod
     def getName(code): 
         return TestStatus.kNames[code]
@@ -106,7 +105,7 @@ def runOneTest(FILENAME, SUBST, OUTPUT, TESTNAME, CLANG, CLANGCC,
     else:
         print >>output, "******************** TEST '%s' HAS NO RUN LINE! ********************"%(TESTNAME,)
         output.flush()
-        return TestStatus.NoRunLine
+        return TestStatus.Fail
 
     FILENAME = os.path.abspath(FILENAME)
     SCRIPT = OUTPUT + '.script'