Merge pull request #1205 from mnordsletten/dev

Install script + testrunner log files

Author: alfreb

install.sh

@@ -17,7 +17,7 @@ export INCLUDEOS_ENABLE_TEST=${INCLUDEOS_ENABLE_TEST-OFF}
 
 # Initialize variables:
 install_yes=0
-verbose=0
+quiet=0
 source=0
 
 while getopts "h?yqs" opt; do
@@ -150,7 +150,7 @@ printf "    %-25s %-25s %s\n"\
 
 # Give user option to evaluate install options
 if tty -s && [ $install_yes -eq 0 ]; then
-	read -p "Is this correct [Y|n]?" answer
+	read -p "Is this correct [Y/n]?" answer
 	answer=${answer:-"Y"}	# Default value
 	case $answer in
 		[yY] | [yY][Ee][Ss] )

test/testrunner.py

@@ -67,7 +67,7 @@ def __init__(self, path, clean=False, command=['python', 'test.py'], name=None):
         self.command_ = command
         self.proc_ = None
         self.path_ = path
-        self.output_ = None
+        self.output_ = []
         self.clean = clean
         # Extract category and type from the path variable
         # Category is linked to the top level folder e.g. net, fs, hw
@@ -133,9 +133,11 @@ def start(self):
         if self.clean:
             self.clean_test()
 
+        logfile_stdout = open('log_stdout.log', 'w')
+        logfile_stderr = open('log_stderr.log', 'w')
         self.proc_ = subprocess.Popen(self.command_, shell=False,
-                                      stdout=subprocess.PIPE,
-                                      stderr=subprocess.PIPE)
+                                      stdout=logfile_stdout,
+                                      stderr=logfile_stderr)
         os.chdir(startdir)
         return self
 
@@ -158,7 +160,14 @@ def wait_status(self):
         self.print_start()
 
         # Start and wait for the process
-        self.output_ = self.proc_.communicate()
+        self.proc_.communicate()
+
+        with open('{}/log_stdout.log'.format(self.path_), 'r') as log_stdout:
+            self.output_.append(log_stdout.read())
+
+        with open('{}/log_stderr.log'.format(self.path_), 'r') as log_stderr:
+            self.output_.append(log_stderr.read())
+
 
         if self.proc_.returncode == 0:
             print pretty.PASS_INLINE()