fix

diff --git a/system/TestMain.py b/system/TestMain.py
index 314d7fc..1bf482d 100755 (executable)
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -27,12 +27,12 @@ class TestMain:
                      'standby_20', SEP,
                      'nodes_booted', 'nodes_ssh', 'check_slices',
                      'check_initscripts', 'check_tcp',SEP,
-                     'force_kill_qemus', 'force_gather_logs' ]
+                     'force_gather_logs', 'force_kill_qemus', ]
     other_steps = [ 'stop_all_vservers','fresh_install', 'cache_rpm', 'stop', SEP,
                     'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys', SEP,
                     'show_boxes', 'list_all_qemus', 'list_qemus', SEP,
                     'db_dump' , 'db_restore',
-                    'standby_1 through 20', SEP,
+                    'standby_1 through 20'
                     ]
     default_build_url = "http://svn.planet-lab.org/svn/build/trunk"
 

diff --git a/system/TestPlc.py b/system/TestPlc.py
index ad43ada..fb259f5 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -647,7 +647,7 @@ class TestPlc:
         return True
 
     def gather_var_logs (self):
-        to_plc = self.actual_command_in_guest("tar -cf - /var/log")        
+        to_plc = self.actual_command_in_guest("tar -C /var/log/ -cf - .")        
         command = to_plc + "| tar -C logs/%s-var-log -xf -"%self.name()
         utils.system("mkdir -p logs/%s-var-log"%self.name())
         utils.system(command)