[gentoo-commits] proj/libbash:master commit in: src/builtins/tests/, src/builtins/

[Petteri Räty]

commit:     d33c85725fde46652bf0d625e3738103686f3190
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 08:52:58 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu May 26 14:56:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=d33c8572

Builtin: source returns 1 if the script is illegal

If the given script can not be parsed properly, source will return
1 rather than printing error message only. A test is added for
testing empty argument.

---
 src/builtins/source_builtin.cpp     |    3 +++
 src/builtins/tests/source_tests.cpp |   19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/builtins/source_builtin.cpp b/src/builtins/source_builtin.cpp
index 87f8a5d..5f78177 100644
--- a/src/builtins/source_builtin.cpp
+++ b/src/builtins/source_builtin.cpp
@@ -50,7 +50,10 @@ int source_builtin::exec(const std::vector<std::string>& bash_args)
   {
     stored_ast.reset(new bash_ast(path));
     if(stored_ast->get_error_count())
+    {
       std::cerr << path << " could not be parsed properly" << std::endl;
+      return 1;
+    }
   }
 
   const std::string& original_path = _walker.resolve<std::string>("0");

diff --git a/src/builtins/tests/source_tests.cpp b/src/builtins/tests/source_tests.cpp
index 4549954..b051de3 100644
--- a/src/builtins/tests/source_tests.cpp
+++ b/src/builtins/tests/source_tests.cpp
@@ -73,3 +73,22 @@ TEST(source_builtin_test, source_return)
   EXPECT_EQ(status, 10);
   EXPECT_TRUE(walker.is_unset_or_null("NOT_EXIST", 0));
 }
+
+TEST(source_builtin_test, invalid)
+{
+  interpreter walker;
+  EXPECT_THROW(cppbash_builtin::exec("source",
+                                     {},
+                                     std::cout,
+                                     std::cerr,
+                                     std::cin,
+                                     walker),
+               interpreter_exception);
+  int status = cppbash_builtin::exec("source",
+                                     {get_src_dir() + "/scripts/illegal_script.sh"},
+                                     std::cout,
+                                     std::cerr,
+                                     std::cin,
+                                     walker);
+  EXPECT_NE(status, 0);
+}