[llvm-branch-commits] [llvm-branch] r195374 - Merging r195333:

[Bill Wendling]

Author: void
Date: Thu Nov 21 14:06:33 2013
New Revision: 195374

URL: http://llvm.org/viewvc/llvm-project?rev=195374&view=rev
Log:
Merging r195333:
------------------------------------------------------------------------
r195333 | kcc | 2013-11-21 01:28:16 -0800 (Thu, 21 Nov 2013) | 1 line

add 'REQUIRES: asserts' to a test that uses 'llc -debug'; this fixes the no-asserts build
------------------------------------------------------------------------

Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/test/CodeGen/Generic/isel-optnone.ll

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 21 14:06:33 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195138,195152,195157,195161-195162,195193,195272,195317-195318,195355
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195138,195152,195157,195161-195162,195193,195272,195317-195318,195333,195355

Modified: llvm/branches/release_34/test/CodeGen/Generic/isel-optnone.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/test/CodeGen/Generic/isel-optnone.ll?rev=195374&r1=195373&r2=195374&view=diff
==============================================================================
--- llvm/branches/release_34/test/CodeGen/Generic/isel-optnone.ll (original)
+++ llvm/branches/release_34/test/CodeGen/Generic/isel-optnone.ll Thu Nov 21 14:06:33 2013
@@ -1,4 +1,5 @@
 ; RUN: llc -debug < %s -o /dev/null 2>&1 | FileCheck %s
+; REQUIRES: asserts
 
 ; Verify that the backend correctly overrides the optimization level
 ; of optnone functions during instruction selection.