diff options
Diffstat (limited to 'clang/test')
-rw-r--r-- | clang/test/Driver/unknown-std.c | 19 | ||||
-rw-r--r-- | clang/test/Driver/unknown-std.cl | 2 | ||||
-rw-r--r-- | clang/test/Driver/unknown-std.cpp | 9 |
3 files changed, 7 insertions, 23 deletions
diff --git a/clang/test/Driver/unknown-std.c b/clang/test/Driver/unknown-std.c index 047726fbef9..41736ec4887 100644 --- a/clang/test/Driver/unknown-std.c +++ b/clang/test/Driver/unknown-std.c @@ -7,24 +7,13 @@ // RUN: not %clang -x renderscript %s -std=foobar -c 2>&1 | FileCheck --match-full-lines %s // CHECK: error: invalid value 'foobar' in '-std=foobar' -// CHECK-NEXT: note: use 'c89' for 'ISO C 1990' standard -// CHECK-NEXT: note: use 'c90' for 'ISO C 1990' standard -// CHECK-NEXT: note: use 'iso9899:1990' for 'ISO C 1990' standard +// CHECK-NEXT: note: use 'c89', 'c90', or 'iso9899:1990' for 'ISO C 1990' standard // CHECK-NEXT: note: use 'iso9899:199409' for 'ISO C 1990 with amendment 1' standard -// CHECK-NEXT: note: use 'gnu89' for 'ISO C 1990 with GNU extensions' standard -// CHECK-NEXT: note: use 'gnu90' for 'ISO C 1990 with GNU extensions' standard -// CHECK-NEXT: note: use 'c99' for 'ISO C 1999' standard -// CHECK-NEXT: note: use 'c9x' for 'ISO C 1999' standard -// CHECK-NEXT: note: use 'iso9899:1999' for 'ISO C 1999' standard -// CHECK-NEXT: note: use 'iso9899:199x' for 'ISO C 1999' standard +// CHECK-NEXT: note: use 'gnu89' or 'gnu90' for 'ISO C 1990 with GNU extensions' standard +// CHECK-NEXT: note: use 'c99' or 'iso9899:1999' for 'ISO C 1999' standard // CHECK-NEXT: note: use 'gnu99' for 'ISO C 1999 with GNU extensions' standard -// CHECK-NEXT: note: use 'gnu9x' for 'ISO C 1999 with GNU extensions' standard -// CHECK-NEXT: note: use 'c11' for 'ISO C 2011' standard -// CHECK-NEXT: note: use 'c1x' for 'ISO C 2011' standard -// CHECK-NEXT: note: use 'iso9899:2011' for 'ISO C 2011' standard -// CHECK-NEXT: note: use 'iso9899:201x' for 'ISO C 2011' standard +// CHECK-NEXT: note: use 'c11' or 'iso9899:2011' for 'ISO C 2011' standard // CHECK-NEXT: note: use 'gnu11' for 'ISO C 2011 with GNU extensions' standard -// CHECK-NEXT: note: use 'gnu1x' for 'ISO C 2011 with GNU extensions' standard // Make sure that no other output is present. // CHECK-NOT: {{^.+$}} diff --git a/clang/test/Driver/unknown-std.cl b/clang/test/Driver/unknown-std.cl index b87a8c881ce..71c478afca8 100644 --- a/clang/test/Driver/unknown-std.cl +++ b/clang/test/Driver/unknown-std.cl @@ -6,7 +6,7 @@ // RUN: FileCheck --match-full-lines %s // CHECK: error: invalid value 'foobar' in '-std=foobar' -// CHECK-NEXT: note: use 'cl' for 'OpenCL 1.0' standard +// CHECK-NEXT: note: use 'cl1.0' for 'OpenCL 1.0' standard // CHECK-NEXT: note: use 'cl1.1' for 'OpenCL 1.1' standard // CHECK-NEXT: note: use 'cl1.2' for 'OpenCL 1.2' standard // CHECK-NEXT: note: use 'cl2.0' for 'OpenCL 2.0' standard diff --git a/clang/test/Driver/unknown-std.cpp b/clang/test/Driver/unknown-std.cpp index 0ffc1e2cb71..4f7a5e64a6e 100644 --- a/clang/test/Driver/unknown-std.cpp +++ b/clang/test/Driver/unknown-std.cpp @@ -7,16 +7,11 @@ // RUN: not %clang -x cuda -nocudainc -nocudalib %s -std=foobar -c 2>&1 | FileCheck --match-full-lines --check-prefix=CHECK --check-prefix=CUDA %s // CHECK: error: invalid value 'foobar' in '-std=foobar' -// CHECK-NEXT: note: use 'c++98' for 'ISO C++ 1998 with amendments' standard -// CHECK-NEXT: note: use 'c++03' for 'ISO C++ 1998 with amendments' standard -// CHECK-NEXT: note: use 'gnu++98' for 'ISO C++ 1998 with amendments and GNU extensions' standard -// CHECK-NEXT: note: use 'c++0x' for 'ISO C++ 2011 with amendments' standard +// CHECK-NEXT: note: use 'c++98' or 'c++03' for 'ISO C++ 1998 with amendments' standard +// CHECK-NEXT: note: use 'gnu++98' or 'gnu++03' for 'ISO C++ 1998 with amendments and GNU extensions' standard // CHECK-NEXT: note: use 'c++11' for 'ISO C++ 2011 with amendments' standard -// CHECK-NEXT: note: use 'gnu++0x' for 'ISO C++ 2011 with amendments and GNU extensions' standard // CHECK-NEXT: note: use 'gnu++11' for 'ISO C++ 2011 with amendments and GNU extensions' standard -// CHECK-NEXT: note: use 'c++1y' for 'ISO C++ 2014 with amendments' standard // CHECK-NEXT: note: use 'c++14' for 'ISO C++ 2014 with amendments' standard -// CHECK-NEXT: note: use 'gnu++1y' for 'ISO C++ 2014 with amendments and GNU extensions' standard // CHECK-NEXT: note: use 'gnu++14' for 'ISO C++ 2014 with amendments and GNU extensions' standard // CHECK-NEXT: note: use 'c++1z' for 'Working draft for ISO C++ 2017' standard // CHECK-NEXT: note: use 'gnu++1z' for 'Working draft for ISO C++ 2017 with GNU extensions' standard |