[med-svn] [castxml] 01/03: Imported Upstream version 0.1+git20150807

Steven Michael Robbins smr at moszumanska.debian.org
Sat Aug 8 04:39:48 UTC 2015


This is an automated email from the git hooks/post-receive script.

smr pushed a commit to branch master
in repository castxml.

commit c37bb0e6bcd09963ff99bbc768af308c0094f74b
Author: Steve M. Robbins <smr at sumost.ca>
Date:   Fri Aug 7 22:57:16 2015 -0500

    Imported Upstream version 0.1+git20150807
---
 README.rst                               | 5 +++--
 src/RunClang.cxx                         | 5 ++++-
 src/Version.cmake                        | 2 +-
 test/CMakeLists.txt                      | 1 +
 test/expect/cmd.input-missing.result.txt | 1 +
 test/expect/cmd.input-missing.stderr.txt | 2 ++
 test/expect/cmd.rsp-missing.result.txt   | 1 +
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 4a39526..cd420a3 100644
--- a/README.rst
+++ b/README.rst
@@ -46,8 +46,9 @@ To build CastXML from source, first obtain the prerequisites:
 * `LLVM/Clang`_ compiler SDK install tree built using the C++ compiler.
   This version of CastXML has been tested with LLVM/Clang
 
-  - Release ``3.6.0``
-  - SVN revision ``240941``
+  - SVN revision ``243888``
+  - Release ``3.7``
+  - Release ``3.6``
 
 * Optionally, the `Sphinx`_ documentation generator to build documentation.
 
diff --git a/src/RunClang.cxx b/src/RunClang.cxx
index 54535c0..d902123 100644
--- a/src/RunClang.cxx
+++ b/src/RunClang.cxx
@@ -318,6 +318,9 @@ static int runClangImpl(const char* const* argBeg,
 
   // Ask the driver to build the compiler commands for us.
   std::unique_ptr<clang::driver::Compilation> c(d.BuildCompilation(cArgs));
+  if (diags->hasErrorOccurred()) {
+    return 1;
+  }
 
   // For '-###' just print the jobs and exit early.
   if(c->getArgs().hasArg(clang::driver::options::OPT__HASH_HASH_HASH)) {
@@ -334,7 +337,7 @@ static int runClangImpl(const char* const* argBeg,
   // Run Clang for each compilation computed by the driver.
   // This should be once per input source file.
   bool result = true;
-  for(clang::driver::Job const& job : c->getJobs()) {
+  for(auto const& job : c->getJobs()) {
     clang::driver::Command const* cmd =
       llvm::dyn_cast<clang::driver::Command>(&job);
     if(cmd && strcmp(cmd->getCreator().getName(), "clang") == 0) {
diff --git a/src/Version.cmake b/src/Version.cmake
index c0da795..b9697e6 100644
--- a/src/Version.cmake
+++ b/src/Version.cmake
@@ -39,7 +39,7 @@ elseif(COMMAND _git)
       set(CastXML_VERSION "${CastXML_VERSION}-git")
     endif()
   endif()
-elseif("d30d102" MATCHES "^([0-9a-f]+)$")
+elseif("8a08a44" MATCHES "^([0-9a-f]+)$")
   # Use version exported by 'git archive'.
   set(CastXML_VERSION "${CastXML_VERSION}-g${CMAKE_MATCH_1}")
 else()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a104cb9..f44680f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -126,6 +126,7 @@ 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(gccxml-empty-c++98-c --castxml-gccxml -std=c++98 ${empty_cxx} -c)
+castxml_test_cmd(input-missing ${input}/does-not-exist.c)
 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.input-missing.result.txt b/test/expect/cmd.input-missing.result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/test/expect/cmd.input-missing.result.txt
@@ -0,0 +1 @@
+1
diff --git a/test/expect/cmd.input-missing.stderr.txt b/test/expect/cmd.input-missing.stderr.txt
new file mode 100644
index 0000000..f46a447
--- /dev/null
+++ b/test/expect/cmd.input-missing.stderr.txt
@@ -0,0 +1,2 @@
+^error: no such file or directory: '.*/test/input/does-not-exist.c'
+error: no input files$
diff --git a/test/expect/cmd.rsp-missing.result.txt b/test/expect/cmd.rsp-missing.result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/test/expect/cmd.rsp-missing.result.txt
@@ -0,0 +1 @@
+1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/castxml.git



More information about the debian-med-commit mailing list