Second Life viewer sources 1.18.3.2-RC

3 files changed, 8 insertions, 4 deletions

diff --git a/linden/indra/test/lltemplatemessagebuilder_tut.cpp b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
index 5f58660..7aff445 100644
--- a/linden/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -36,7 +36,7 @@
 #include "llquaternion.h"
 #include "lltemplatemessagebuilder.h"
 #include "lltemplatemessagereader.h"
-#include "llversion.h"
+#include "llversionserver.h"
 #include "message_prehash.h"
 #include "u64.h"
 #include "v3dmath.h"
diff --git a/linden/indra/test/message_tut.cpp b/linden/indra/test/message_tut.cpp
index 3425315..2a7bf45 100644
--- a/linden/indra/test/message_tut.cpp
+++ b/linden/indra/test/message_tut.cpp
@@ -32,7 +32,7 @@
 #include "lltut.h"
 
 #include "llapr.h"
-#include "llversion.h"
+#include "llversionserver.h"
 #include "message.h"
 #include "message_prehash.h"
 
diff --git a/linden/indra/test/test_llmanifest.py b/linden/indra/test/test_llmanifest.py
index 8bfca24..797d5ac 100644
--- a/linden/indra/test/test_llmanifest.py
+++ b/linden/indra/test/test_llmanifest.py
@@ -106,9 +106,13 @@ class TestLLManifest(unittest.TestCase):
 
     def testruncommand(self):
         self.assertEqual("Hello\n", self.m.run_command("echo Hello"))
-        def tmp_test():
+        def exit_1_test():
+            self.m.run_command("exit 1")
+        self.assertRaises(RuntimeError, exit_1_test)
+        def not_found_test():
             self.m.run_command("test_command_that_should_not_be_found")
-        self.assertRaises(RuntimeError, tmp_test)
+        self.assertRaises(RuntimeError, not_found_test)
+
 
     def testpathof(self):
         self.assertEqual(self.m.src_path_of("a"), "src/a")