Adding in new solution builder pattern.

site_scons/site_tools/component_builders.py

 #!/usr/bin/python2.4
 # Copyright 2008, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 299 matching lines @@
 
   # Install program and resources
   all_outputs = []
   components = _RetrieveComponents(prog_name)
   for resource, dest_dir in env.get('COMPONENT_TEST_RESOURCES').items():
     all_outputs += env.ReplicatePublished(dest_dir, components, resource)
 
   # Add installed program and resources to the alias
   env.Alias(prog_name, all_outputs)
 
-  # Add an alias for running the test in the test directory, if there's a test
-  # command line.
-  if env.get('COMPONENT_TEST_CMDLINE'):
-    # Test program is the first run resource we replicated.
-    test_program = env.ReplicatePublished('$TESTS_DIR', prog_name, 'run')
+  # Add target properties
+  env.SetTargetProperty(
+      prog_name,
+      # The copy of the program we care about is the one in the tests dir
+      EXE='$TESTS_DIR/$PROGRAM_NAME',
+      RUN_CMDLINE='$COMPONENT_TEST_CMDLINE',
+      RUN_DIR='$TESTS_DIR',
+      TARGET_PATH='$TESTS_DIR/$PROGRAM_NAME',
+  )
+
+  # Add an alias for running the test in the test directory, if the test is
+  # runnable and has a test command line.
+  if env.get('COMPONENT_TEST_RUNNABLE') and env.get('COMPONENT_TEST_CMDLINE'):
     env.Replace(
         COMMAND_OUTPUT_CMDLINE=env['COMPONENT_TEST_CMDLINE'],
         COMMAND_OUTPUT_RUN_DIR='$TESTS_DIR',
     )
     test_out_name = '$TEST_OUTPUT_DIR/${PROGRAM_BASENAME}.out.txt'
     if (env.GetOption('component_test_retest')
         and env.File(test_out_name).exists()):
       # Delete old test results, so test will rerun.
       env.Execute(SCons.Script.Delete(test_out_name))
 
     # Set timeout based on test size
     timeout = env.get('COMPONENT_TEST_TIMEOUT')
     if type(timeout) is dict:
       timeout = timeout.get(env.get('COMPONENT_TEST_SIZE'))
     if timeout:
       env['COMMAND_OUTPUT_TIMEOUT'] = timeout
 
+    # Test program is the first run resource we replicated.  (Duplicate
+    # replicate is not harmful, and is a handy way to pick out the correct
+    # file from all those we replicated above.)
+    test_program = env.ReplicatePublished('$TESTS_DIR', prog_name, 'run')
+
     # Run the test.  Note that we need to refer to the file by name, so that
     # SCons will recreate the file node after we've deleted it; if we used the
     # env.File() we created in the if statement above, SCons would still think
     # it exists and not rerun the test.
     test_out = env.CommandOutput(test_out_name, test_program)
 
     # Running the test requires the test and its libs copied to the tests dir
     env.Depends(test_out, all_outputs)
     env.ComponentTestOutput('run_' + prog_name, test_out)
 
     # Add target properties
-    env.SetTargetProperty(
-        prog_name,
-        # The copy of the program we care about is the one in the tests dir
-        EXE='$TESTS_DIR/$PROGRAM_NAME',
-        RUN_TARGET='run_' + prog_name,
-        RUN_CMDLINE='$COMPONENT_TEST_CMDLINE',
-        RUN_DIR='$TESTS_DIR',
-        TARGET_PATH='$TESTS_DIR/$PROGRAM_NAME',
-    )
-
+    env.SetTargetProperty(prog_name, RUN_TARGET='run_' + prog_name)
 
 def ComponentTestProgram(self, prog_name, *args, **kwargs):
   """Pseudo-builder for test program to handle platform-dependent type.
 
   Args:
     self: Environment in which we were called.
     prog_name: Test program name.
     args: Positional arguments.
     kwargs: Keyword arguments.
 
@@ skipping 154 matching lines @@
       # have transitioned to LIB_DIR
       COMPONENT_LIBRARY_DIR='$LIB_DIR',
       STAGING_DIR='$TARGET_ROOT/staging',
       TESTS_DIR='$TARGET_ROOT/tests',
       TEST_OUTPUT_DIR='$TARGET_ROOT/test_output',
       # Default command line for a test is just the name of the file.
       # TODO(rspangler): Why doesn't the following work:
       # COMPONENT_TEST_CMDLINE='${SOURCE.abspath}',
       # (it generates a SCons error)
       COMPONENT_TEST_CMDLINE='${PROGRAM_NAME}',
+      # Component tests are runnable by default.
+      COMPONENT_TEST_RUNNABLE=True,
       # Default test size is large
       COMPONENT_TEST_SIZE='large',
       # Default timeouts for component tests
       COMPONENT_TEST_TIMEOUT={'large': 900, 'medium': 450, 'small': 180},
       # Tests are enabled by default
       COMPONENT_TEST_ENABLED=True,
       # Static linking is a sensible default
       COMPONENT_STATIC=True,
       # Don't publish libraries to the staging dir by themselves by default.
       COMPONENT_LIBRARY_PUBLISH=False,
@@ skipping 56 matching lines @@
   AddTargetGroup('all_libraries', 'libraries can be built')
   AddTargetGroup('all_programs', 'programs can be built')
   AddTargetGroup('all_test_programs', 'tests can be built')
   AddTargetGroup('all_packages', 'packages can be built')
   AddTargetGroup('run_all_tests', 'tests can be run')
   AddTargetGroup('run_disabled_tests', 'tests are disabled')
   AddTargetGroup('run_small_tests', 'small tests can be run')
   AddTargetGroup('run_medium_tests', 'medium tests can be run')
   AddTargetGroup('run_large_tests', 'large tests can be run')