[llvm-branch-commits] [llvm-branch] r90620 - in /llvm/branches/Apple/Zoidberg/test/FrontendC: 2007-04-11-InlineStorageClassC89.c 2007-04-11-InlineStorageClassC99.c

[Bill Wendling]

Author: void
Date: Fri Dec  4 17:17:06 2009
New Revision: 90620

URL: http://llvm.org/viewvc/llvm-project?rev=90620&view=rev
Log:
$ svn merge -c -72620 https://llvm.org/svn/llvm-project/llvm/trunk
--- Reverse-merging r72620 into '.':
U    test/FrontendC/2007-04-11-InlineStorageClassC99.c
U    test/FrontendC/2007-04-11-InlineStorageClassC89.c


Modified:
    llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC89.c
    llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC99.c

Modified: llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC89.c
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC89.c?rev=90620&r1=90619&r2=90620&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC89.c (original)
+++ llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC89.c Fri Dec  4 17:17:06 2009
@@ -11,8 +11,9 @@
 // RUN:   grep -v linkonce | count 1
 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xstatnoWeak | grep internal | count 1
-// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xextnoWeak | grep available_externally | count 1
+// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN:   grep xextnoWeak | grep -v internal | grep -v weak | \
+// RUN:   grep -v linkonce | count 1
 inline int xglobWeak(int) __attribute__((weak));
 inline int xglobWeak (int i) {
   return i*2;

Modified: llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC99.c
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC99.c?rev=90620&r1=90619&r2=90620&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC99.c (original)
+++ llvm/branches/Apple/Zoidberg/test/FrontendC/2007-04-11-InlineStorageClassC99.c Fri Dec  4 17:17:06 2009
@@ -1,13 +1,14 @@
-// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xglobWeak | grep weak | count 1
+// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN:   grep xglobWeak | grep extern_weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xextWeak | grep weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xWeaknoinline | grep weak | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xWeakextnoinline | grep weak | count 1
-// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
-// RUN:   grep xglobnoWeak | grep available_externally | count 1
+// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN:   grep xglobnoWeak | grep -v internal | grep -v weak | \
+// RUN:   grep -v linkonce | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \
 // RUN:   grep xstatnoWeak | grep internal | count 1
 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \