Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b72fa3aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" am: 203fd770 

Change-Id: I939b4d3da99d36b715160dd29fa12ebb45d426bd
parents 0806a1fd 203fd770

core/instrumentation_test_config_template.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<configuration description="Runs {LABEL}.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />

    {EXTRA_CONFIGS}

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="{MODULE}.apk" />

tools/auto_gen_test_config.py

+9 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ ATTRIBUTE_RUNNER = 'android:name' 
ATTRIBUTE_PACKAGE = 'package'



PLACEHOLDER_LABEL = '{LABEL}'

PLACEHOLDER_EXTRA_CONFIGS = '{EXTRA_CONFIGS}'

PLACEHOLDER_MODULE = '{MODULE}'

PLACEHOLDER_PACKAGE = '{PACKAGE}'

PLACEHOLDER_RUNNER = '{RUNNER}'
@@ -41,16 +42,20 @@ def main(argv): 
  Returns:

    0 if no error, otherwise 1.

  """

  if len(argv) != 4:

  if len(argv) != 4 and len(argv) != 6:

    sys.stderr.write(

        'Invalid arguements. The script requires 4 arguments for file paths: '

        'Invalid arguments. The script requires 4 arguments for file paths: '

        'target_config android_manifest empty_config '

        'instrumentation_test_config_template.\n')

        'instrumentation_test_config_template '

        'and 2 optional arguments for extra configs: '

        '--extra-configs \'EXTRA_CONFIGS\'.\n')

    return 1



  target_config = argv[0]

  android_manifest = argv[1]

  empty_config = argv[2]

  instrumentation_test_config_template = argv[3]

  extra_configs = '\n'.join(argv[5].split('\\n')) if len(argv) == 6 else ''



  manifest = parse(android_manifest)

  instrumentation_elements = manifest.getElementsByTagName('instrumentation')
@@ -80,6 +85,7 @@ def main(argv): 
    config = config.replace(PLACEHOLDER_MODULE, module)

    config = config.replace(PLACEHOLDER_PACKAGE, package)

    config = config.replace(PLACEHOLDER_TEST_TYPE, test_type)

    config = config.replace(PLACEHOLDER_EXTRA_CONFIGS, extra_configs)

    config = config.replace(PLACEHOLDER_RUNNER, runner)

    with open(target_config, 'w') as config_file:

      config_file.write(config)