[cig-commits] commit: Merge.

[Mercurial]

changeset:   735:214a8dcdc095
branch:      pcu_rejig
parent:      734:fed6a1c46542
parent:      732:31a90adec0ec
user:        JericoRevote
date:        Mon Dec 14 10:24:09 2009 +1100
description:
Merge.


diff -r fed6a1c46542 -r 214a8dcdc095 Base/Automation/src/HierarchyTable.c
--- a/Base/Automation/src/HierarchyTable.c	Fri Dec 11 18:01:02 2009 +1100
+++ b/Base/Automation/src/HierarchyTable.c	Mon Dec 14 10:24:09 2009 +1100
@@ -112,7 +112,8 @@ void HierarchyTable_PrintChildren( void*
 	Stream_Flush( stream );
 	Stream_Indent( stream );
 
-	for ( entry_I = 0 ; entry_I < self->max ; entry_I++ ) {
+   /* increasing terminating limit by 1 - seems to be right due to comments in HashTable.c ~line 154 */
+	for ( entry_I = 0 ; entry_I < self->max+1 ; entry_I++ ) {
 		hashTableEntry = self->entries[ entry_I ];
 
 		while( hashTableEntry ){
diff -r fed6a1c46542 -r 214a8dcdc095 Base/Automation/src/Stg_Component.c
--- a/Base/Automation/src/Stg_Component.c	Fri Dec 11 18:01:02 2009 +1100
+++ b/Base/Automation/src/Stg_Component.c	Mon Dec 14 10:24:09 2009 +1100
@@ -342,7 +342,7 @@ void Stg_Component_Destroy( void* compon
 void Stg_Component_Destroy( void* component, void* data, Bool force ) {
 	Stg_Component* self = (Stg_Component*)component;
 
-	if( /* force TODO: remove this comment after pcu_rejig period|| */ !self->isDestroyed ) {
+	if( /* TODO: once the refCounters are implemented there is no longeer a need to check self|| */ self && !self->isDestroyed ) {
 		/*Stg_TimeMonitor*	tm;
 		Stg_MemMonitor*		mm;
 		char*						buf;
diff -r fed6a1c46542 -r 214a8dcdc095 pcu/script/pcutest.py
--- a/pcu/script/pcutest.py	Fri Dec 11 18:01:02 2009 +1100
+++ b/pcu/script/pcutest.py	Mon Dec 14 10:24:09 2009 +1100
@@ -79,9 +79,12 @@ int main( int argc, char* argv[] ) {
     return File(target.abspath)
 
 def generate(env, **kw):
-    env.SetDefault(PCUALL_TARGET="check")
-    env.SetDefault(PCUUNIT_TARGET="unit")
-    env.SetDefault(PCUSYSTEST_TARGET="systest")
+    env.SetDefault(PCUALL_TARGET="check-complete")
+    env.SetDefault(REGTEST_TARGET="check")
+    env.SetDefault(UNIT_TARGET="check-unit")
+    env.SetDefault(INTEGRATION_TARGET="check-integration")
+    env.SetDefault(CONVERGENCE_TARGET="check-convergence")
+    env.SetDefault(LOWRES_TARGET="check-lowres")
     # Make the 'all' target point to everything.
 
     def PCUSuite(env, target, source, **kw):
@@ -111,25 +114,52 @@ def generate(env, **kw):
         libs = multiget([kw, env], 'LIBS', []) + ["pcu"]
         test = env.Program(target[0], objs, LIBS=libs)
         runner = env.Action('-' + test[0].abspath)
-        env.Alias(env["PCUUNIT_TARGET"], [exps, inputs, test], runner)
-        env.AlwaysBuild(env["PCUUNIT_TARGET"])
-        env.Alias(env['PCUALL_TARGET'], env['PCUUNIT_TARGET'])
+        env.Alias(env["UNIT_TARGET"], [exps, inputs, test], runner)
+        env.AlwaysBuild(env["UNIT_TARGET"])
+        env.Alias(env['PCUALL_TARGET'], env['UNIT_TARGET'])
+        env.Alias(env['REGTEST_TARGET'], env['UNIT_TARGET'])
         return test
 
-    def PCUSysTest(env, target, source, **kw):
+    def IntegrationTest(env, target, source, **kw):
         script = File(source[0].split()[0]).srcnode().abspath
         script_dir = os.path.dirname(script)
         script = os.path.basename(script)
         args = source[0].split()[1:]
 
         runner = env.Action('-./' + script + ' ' + ' '.join(args), chdir=script_dir)
-        env.Alias(env["PCUSYSTEST_TARGET"], [], runner)
-        env.AlwaysBuild(env["PCUSYSTEST_TARGET"])
-        env.Alias(env['PCUALL_TARGET'], env['PCUSYSTEST_TARGET'])
+        env.Alias(env["INTEGRATION_TARGET"], [], runner)
+        env.AlwaysBuild(env["INTEGRATION_TARGET"])
+        env.Alias(env['PCUALL_TARGET'], env['INTEGRATION_TARGET'])
+        return None
+
+
+    def LowResTest(env, target, source, **kw):
+        script = File(source[0].split()[0]).srcnode().abspath
+        script_dir = os.path.dirname(script)
+        script = os.path.basename(script)
+        args = source[0].split()[1:]
+
+        runner = env.Action('-./' + script + ' ' + ' '.join(args), chdir=script_dir)
+        env.Alias(env["LOWRES_TARGET"], [], runner)
+        env.AlwaysBuild(env["LOWRES_TARGET"])
+        env.Alias(env['PCUALL_TARGET'], env['LOWRES_TARGET'])
+        env.Alias(env['REGTEST_TARGET'], env['LOWRES_TARGET'])
+        return None
+
+    def ConvergenceTest(env, target, source, **kw):
+        script = File(source[0].split()[0]).srcnode().abspath
+        script_dir = os.path.dirname(script)
+        script = os.path.basename(script)
+        args = source[0].split()[1:]
+
+        runner = env.Action('-./' + script + ' ' + ' '.join(args), chdir=script_dir)
+        env.Alias(env["CONVERGENCE_TARGET"], [], runner)
+        env.AlwaysBuild(env["CONVERGENCE_TARGET"])
+        env.Alias(env['PCUALL_TARGET'], env['CONVERGENCE_TARGET'])
         return None
 
     env.Append(BUILDERS={"PCUSuite": PCUSuite, "PCUTest": PCUTest,
-                         'PCUSysTest': PCUSysTest})
+                         "LowResTest": LowResTest, "IntegrationTest": IntegrationTest, "ConvergenceTest": ConvergenceTest})
 
 def exists(env):
     # Should probably have this search for the pcu