summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-08-20 15:51:26 (GMT)
committerBrad King <brad.king@kitware.com>2014-08-20 18:48:12 (GMT)
commit6332fb48e49167e613b851cd7bf825b30ee159f5 (patch)
tree909784b7734aca239f8db4b94f24a34b628b24c8 /test
parentf6f00156791d87c5bf1248b23af563832968db8b (diff)
downloadCastXML-6332fb48e49167e613b851cd7bf825b30ee159f5.zip
CastXML-6332fb48e49167e613b851cd7bf825b30ee159f5.tar.gz
CastXML-6332fb48e49167e613b851cd7bf825b30ee159f5.tar.bz2
Port to LLVM/Clang SVN r216002 (trunk)
Rename 'c++1y' to 'c++14'.
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt2
-rw-r--r--test/expect/cmd.gccxml-and-c++14.result.txt (renamed from test/expect/cmd.gccxml-and-c++1y.result.txt)0
-rw-r--r--test/expect/cmd.gccxml-and-c++14.stderr.txt1
-rw-r--r--test/expect/cmd.gccxml-and-c++1y.stderr.txt1
4 files changed, 2 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 618e617..4675d12 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -109,7 +109,7 @@ castxml_test_cmd(gccxml-twice --castxml-gccxml --castxml-gccxml)
castxml_test_cmd(gccxml-and-c99 --castxml-gccxml -std=c99 ${empty_c})
castxml_test_cmd(gccxml-and-c11 --castxml-gccxml -std=c11 ${empty_c})
castxml_test_cmd(gccxml-and-c++11 --castxml-gccxml -std=c++11 ${empty_cxx})
-castxml_test_cmd(gccxml-and-c++1y --castxml-gccxml -std=c++1y ${empty_cxx})
+castxml_test_cmd(gccxml-and-c++14 --castxml-gccxml -std=c++14 ${empty_cxx})
castxml_test_cmd(gccxml-and-objc1 --castxml-gccxml ${empty_m})
castxml_test_cmd(gccxml-and-objc2 --castxml-gccxml ${empty_mm})
castxml_test_cmd(gccxml-empty-c++98 --castxml-gccxml -std=c++98 ${empty_cxx})
diff --git a/test/expect/cmd.gccxml-and-c++1y.result.txt b/test/expect/cmd.gccxml-and-c++14.result.txt
index d00491f..d00491f 100644
--- a/test/expect/cmd.gccxml-and-c++1y.result.txt
+++ b/test/expect/cmd.gccxml-and-c++14.result.txt
diff --git a/test/expect/cmd.gccxml-and-c++14.stderr.txt b/test/expect/cmd.gccxml-and-c++14.stderr.txt
new file mode 100644
index 0000000..76ed9ea
--- /dev/null
+++ b/test/expect/cmd.gccxml-and-c++14.stderr.txt
@@ -0,0 +1 @@
+^error: '--castxml-gccxml' does not work with c\+\+14$
diff --git a/test/expect/cmd.gccxml-and-c++1y.stderr.txt b/test/expect/cmd.gccxml-and-c++1y.stderr.txt
deleted file mode 100644
index 2505bc0..0000000
--- a/test/expect/cmd.gccxml-and-c++1y.stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^error: '--castxml-gccxml' does not work with c\+\+1y$