diff options
| -rw-r--r-- | src/castxml.cxx | 9 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/expect/cmd.gccxml-and-E.result.txt | 1 | ||||
| -rw-r--r-- | test/expect/cmd.gccxml-and-E.stderr.txt | 4 | ||||
| -rw-r--r-- | test/expect/cmd.gccxml-and-E.stdout.txt | 1 | ||||
| -rw-r--r-- | test/expect/cmd.gccxml-empty-c++98-E.stderr.txt | 1 | ||||
| -rw-r--r-- | test/expect/cmd.gccxml-empty-c++98-E.stdout.txt | 2 |
7 files changed, 6 insertions, 13 deletions
diff --git a/src/castxml.cxx b/src/castxml.cxx index 0dfd7d0..6b00206 100644 --- a/src/castxml.cxx +++ b/src/castxml.cxx @@ -229,15 +229,6 @@ int main(int argc_in, const char** argv_in) } } - if(opts.PPOnly && opts.GccXml) { - std::cerr << - "error: '--castxml-gccxml' and '-E' may not both be given\n" - "\n" << - usage - ; - return 1; - } - if(cc_id) { opts.HaveCC = true; if(cc_args.empty()) { diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fd666b6..0942cf4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -113,6 +113,7 @@ 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}) +castxml_test_cmd(gccxml-empty-c++98-E --castxml-gccxml -std=c++98 ${empty_cxx} -E) castxml_test_cmd(o-missing -o) castxml_test_cmd(start-missing --castxml-start) castxml_test_cmd(rsp-empty @${input}/empty.rsp) diff --git a/test/expect/cmd.gccxml-and-E.result.txt b/test/expect/cmd.gccxml-and-E.result.txt deleted file mode 100644 index d00491f..0000000 --- a/test/expect/cmd.gccxml-and-E.result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/test/expect/cmd.gccxml-and-E.stderr.txt b/test/expect/cmd.gccxml-and-E.stderr.txt index f1248e4..10f3293 100644 --- a/test/expect/cmd.gccxml-and-E.stderr.txt +++ b/test/expect/cmd.gccxml-and-E.stderr.txt @@ -1,3 +1 @@ -^error: '--castxml-gccxml' and '-E' may not both be given - -Usage: castxml .*$ +^$ diff --git a/test/expect/cmd.gccxml-and-E.stdout.txt b/test/expect/cmd.gccxml-and-E.stdout.txt new file mode 100644 index 0000000..10f3293 --- /dev/null +++ b/test/expect/cmd.gccxml-and-E.stdout.txt @@ -0,0 +1 @@ +^$ diff --git a/test/expect/cmd.gccxml-empty-c++98-E.stderr.txt b/test/expect/cmd.gccxml-empty-c++98-E.stderr.txt new file mode 100644 index 0000000..10f3293 --- /dev/null +++ b/test/expect/cmd.gccxml-empty-c++98-E.stderr.txt @@ -0,0 +1 @@ +^$ diff --git a/test/expect/cmd.gccxml-empty-c++98-E.stdout.txt b/test/expect/cmd.gccxml-empty-c++98-E.stdout.txt new file mode 100644 index 0000000..931220e --- /dev/null +++ b/test/expect/cmd.gccxml-empty-c++98-E.stdout.txt @@ -0,0 +1,2 @@ +^#[^ +]*/test/input/empty.cxx" |