reviewed list options parsing

[tests.git] / system / TestResources.py

diff --git a/system/TestResources.py b/system/TestResources.py
index 5d3e1a9..bc928ac 100644 (file)
--- a/system/TestResources.py
+++ b/system/TestResources.py
@@ -1,7 +1,6 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
 #
-# $Id$
-#
-
 import sys
 import traceback
 
@@ -133,13 +132,13 @@ class TestResources:
                 vservername = "%s-%s" % (vservername,simplehostname)
                 #ugly hack for "vuname: vc_set_vhi_name(): Arg list too long" errors
                 if len(vservername) > 38 and preferred_hostname is not None:
-                    vservername = "%s-%s" % (vservername,preferred_hostname)
+                    vservername = "%s-%s" % (options.buildname,preferred_hostname)
             else:
                 plc_counter += 1
                 vservername = "%s-%d-%s" % (vservername,plc_counter,simplehostname)
                 #ugly hack for "vuname: vc_set_vhi_name(): Arg list too long" errors
                 if len(vservername) > 38 and preferred_hostname is not None:
-                    vservername = "%s-%d-%s" % (vservername,plc_counter,preferred_hostname)
+                    vservername = "%s-%d-%s" % (options.buildname,plc_counter,preferred_hostname)
 
             # apply
             plc['vservername']=vservername