diff options
Diffstat (limited to 'build/scripts/slave/recipes/adt')
17 files changed, 78 insertions, 40 deletions
diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-AVD.json b/build/scripts/slave/recipes/adt/adt.expected/linux-AVD.json index 282dfa64..0e23fc99 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-AVD.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-AVD.json @@ -47,7 +47,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "logs-build_516-rev_4696395/AVD_test", + "logs-build_516-rev_4696395", + "--test_dir", + "AVD_test", "--file_pattern", "launch_avd.*", "--config_file", @@ -65,7 +67,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Run AVD Launch Test", - "stderr": "971e3ecfba724b52b616e8c042a23634" + "stderr": "35a240b6a07b42dbb7f45724322b0698" }, { "cmd": [ diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-CTS.json b/build/scripts/slave/recipes/adt/adt.expected/linux-CTS.json index 86003861..2c62e048 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-CTS.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-CTS.json @@ -55,7 +55,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "logs-build_7640-rev_LATEST/CTS_test", + "logs-build_7640-rev_LATEST", + "--test_dir", + "CTS_test", "--file_pattern", "test_cts.*", "--config_file", @@ -73,7 +75,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Run Emulator CTS Test", - "stderr": "85ecd4f5cb034633b1c620a0f22dae46", + "stderr": "01b989ab25634ccf843c297e43598666", "~followup_annotations": [ "@@@STEP_LINK@View XML@../../../CTS_Result/Ubuntu_CTS/build_7640-rev_LATEST/testResult.xml@@@" ] @@ -88,7 +90,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "logs-build_7640-rev_LATEST/GTS_test", + "logs-build_7640-rev_LATEST", + "--test_dir", + "GTS_test", "--file_pattern", "test_cts.*", "--config_file", @@ -107,7 +111,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Run Emulator GTS Test", - "stderr": "f515035070ae4510b5acfa1845a52eb3", + "stderr": "c39040a67bdf424dacc141ca4ffd15e5", "~followup_annotations": [ "@@@STEP_LINK@View XML@../../../GTS_Result/Ubuntu_CTS/build_7640-rev_LATEST/xtsTestResult.xml@@@" ] diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-Console.json b/build/scripts/slave/recipes/adt/adt.expected/linux-Console.json index 1d753757..17421e4e 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-Console.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-Console.json @@ -47,7 +47,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "logs-build_516-rev_4696395/Console_test", + "logs-build_516-rev_4696395", + "--test_dir", + "Console_test", "--file_pattern", "test_console.*", "--config_file", @@ -65,7 +67,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Run Emulator Console Test", - "stderr": "765624b6f01b4515842f2c8b86af38d0", + "stderr": "abe8ec003e5742158e36d24482141bf8", "~followup_annotations": [ "@@@STEP_LINK@View XML@../../../Console_Result/Ubuntu_Console_emu-master-dev/build_516-rev_4696395/consoleTestResult.xml@@@" ] diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-emulator.json b/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-emulator.json index 93852663..4ee81650 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-emulator.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-emulator.json @@ -85,7 +85,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "('logs-build_1090-rev_4696395', 'boot_test_aosp_sysimage-emu-master-dev')", + "logs-build_1090-rev_4696395", + "--test_dir", + "boot_test_aosp_sysimage-emu-master-dev", "--file_pattern", "test_boot.*", "--config_file", @@ -102,7 +104,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Boot Test - aosp System Image - emu-master-dev", - "stderr": "9a84f9f67e88495e8f79697927d5f9bc" + "stderr": "4047d3d7f32f4d62bb69468d614851fa" }, { "cmd": [ diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-sysimg.json b/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-sysimg.json index d041df5e..6758e806 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-sysimg.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-cross-builds-sysimg.json @@ -85,7 +85,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "('logs-build_1090-rev_4696395', 'boot_test_aosp_sysimage-emu-master-dev')", + "logs-build_1090-rev_4696395", + "--test_dir", + "boot_test_aosp_sysimage-emu-master-dev", "--file_pattern", "test_boot.*", "--config_file", @@ -102,7 +104,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Boot Test - aosp System Image - emu-master-dev", - "stderr": "b824b09864084aedb64f65c34ad2618a" + "stderr": "c4d2bd62418b4d92a3206d25e00ab0f2" }, { "cmd": [ diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-emu-master-dev.json b/build/scripts/slave/recipes/adt/adt.expected/linux-emu-master-dev.json index f1b12d66..7dca961c 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-emu-master-dev.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-emu-master-dev.json @@ -67,7 +67,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "('logs-build_1090-rev_4696395', 'boot_test_public_sysimage-emu-master-dev')", + "logs-build_1090-rev_4696395", + "--test_dir", + "boot_test_public_sysimage-emu-master-dev", "--file_pattern", "test_boot.*", "--config_file", @@ -84,7 +86,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_public/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Boot Test - public System Image - emu-master-dev", - "stderr": "67ba564c3069481a88947a4bcdf29c84" + "stderr": "38194b14154246c68aa3eea8cfa640b5" }, { "cmd": [ diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-sysimg-oc.json b/build/scripts/slave/recipes/adt/adt.expected/linux-sysimg-oc.json index 4bed44e9..9447d894 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-sysimg-oc.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-sysimg-oc.json @@ -67,7 +67,9 @@ "--emulator", "/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/emulator/emulator", "--session_dir", - "('logs-build_1090-rev_4695513', 'boot_test_OC_sysimage-sdk emulator')", + "logs-build_1090-rev_4695513", + "--test_dir", + "boot_test_OC_sysimage-sdk emulator", "--file_pattern", "test_boot.*", "--config_file", @@ -84,7 +86,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Boot Test - OC System Image - sdk emulator", - "stderr": "b465806bf7a947d2b7c01630515a5153" + "stderr": "3877eebb5d4e472bb9583d1eb0a4e59c" }, { "cmd": [ diff --git a/build/scripts/slave/recipes/adt/adt.expected/linux-ui.json b/build/scripts/slave/recipes/adt/adt.expected/linux-ui.json index 10934837..c120370d 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/linux-ui.json +++ b/build/scripts/slave/recipes/adt/adt.expected/linux-ui.json @@ -67,7 +67,9 @@ "--emulator", "/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/emulator/emulator", "--session_dir", - "logs-build_1090-rev_4695513/UI_test", + "logs-build_1090-rev_4695513", + "--test_dir", + "UI_test", "--file_pattern", "test_ui.*", "--config_file", @@ -85,7 +87,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Run Emulator UI Test", - "stderr": "6f13962745224544800fbe2e60adb982", + "stderr": "1a5a2271ca0a4f07b0ff03afd96921fe", "~followup_annotations": [ "@@@STEP_LINK@[Report] PASS: UI_TestCase@../../../UI_Result/Ubuntu_UI_sysimg-oc/build_1090-rev_4695513/UI_TestCase_report/index.html@@@" ] diff --git a/build/scripts/slave/recipes/adt/adt.expected/mac-Console.json b/build/scripts/slave/recipes/adt/adt.expected/mac-Console.json index 9d89d786..6cdbb5e8 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/mac-Console.json +++ b/build/scripts/slave/recipes/adt/adt.expected/mac-Console.json @@ -47,7 +47,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "logs-build_516-rev_4696395/Console_test", + "logs-build_516-rev_4696395", + "--test_dir", + "Console_test", "--file_pattern", "test_console.*", "--config_file", @@ -65,7 +67,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/tools:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Run Emulator Console Test", - "stderr": "aff1fc051b084bbea6f4aac6c571e1af", + "stderr": "c42e1c0abfc44d0eaaad1ac6f260c33a", "~followup_annotations": [ "@@@STEP_LINK@View XML@../../../Console_Result/Mac_Console_emu-master-dev/build_516-rev_4696395/consoleTestResult.xml@@@" ] diff --git a/build/scripts/slave/recipes/adt/adt.expected/mac-emu-master-dev.json b/build/scripts/slave/recipes/adt/adt.expected/mac-emu-master-dev.json index 59223d85..a496b2ae 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/mac-emu-master-dev.json +++ b/build/scripts/slave/recipes/adt/adt.expected/mac-emu-master-dev.json @@ -67,7 +67,9 @@ "--emulator", "emu-master-dev/emulator/emulator", "--session_dir", - "('logs-build_1090-rev_4696395', 'boot_test_public_sysimage-emu-master-dev')", + "logs-build_1090-rev_4696395", + "--test_dir", + "boot_test_public_sysimage-emu-master-dev", "--file_pattern", "test_boot.*", "--config_file", @@ -84,7 +86,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/tools:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-macosx_public/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Boot Test - public System Image - emu-master-dev", - "stderr": "583af5089c5f4f37abe263aa2cce2455" + "stderr": "493ba8cd435e4baaa23d47af9a2eaf58" }, { "cmd": [ diff --git a/build/scripts/slave/recipes/adt/adt.expected/mac-ui.json b/build/scripts/slave/recipes/adt/adt.expected/mac-ui.json index 691249ca..c83d0cd0 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/mac-ui.json +++ b/build/scripts/slave/recipes/adt/adt.expected/mac-ui.json @@ -67,7 +67,9 @@ "--emulator", "/usr/local/google/home/cpilch/Android/android-sdk-macosx_image-builds/emulator/emulator", "--session_dir", - "logs-build_1090-rev_4695513/UI_test", + "logs-build_1090-rev_4695513", + "--test_dir", + "UI_test", "--file_pattern", "test_ui.*", "--config_file", @@ -85,7 +87,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-macosx_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-macosx_image-builds/tools/bin:/usr/local/google/home/cpilch/Android/android-sdk-macosx_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-macosx_image-builds/build-tools/23.0.2:/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin" }, "name": "Run Emulator UI Test", - "stderr": "955b0ce8279b45fb9f87fe432fcc6a20", + "stderr": "1f8b11e21efa4cd28304f98f35057d54", "~followup_annotations": [ "@@@STEP_LINK@[Report] PASS: UI_TestCase@../../../UI_Result/Mac_UI_sysimg-oc/build_1090-rev_4695513/UI_TestCase_report/index.html@@@" ] diff --git a/build/scripts/slave/recipes/adt/adt.expected/win-ui.json b/build/scripts/slave/recipes/adt/adt.expected/win-ui.json index aae0a28d..08952a2e 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/win-ui.json +++ b/build/scripts/slave/recipes/adt/adt.expected/win-ui.json @@ -67,7 +67,9 @@ "--emulator", "/usr/local/google/home/cpilch/Android/android-sdk_image-builds\\emulator\\emulator", "--session_dir", - "logs-build_1090-rev_4695513\\UI_test", + "logs-build_1090-rev_4695513", + "--test_dir", + "UI_test", "--file_pattern", "test_ui.*", "--config_file", @@ -85,7 +87,7 @@ "PATH": "%(PATH)s;/usr/local/google/home/cpilch/Android/android-sdk_image-builds/tools;/usr/local/google/home/cpilch/Android/android-sdk_image-builds/tools/bin;/usr/local/google/home/cpilch/Android/android-sdk_image-builds/platform-tools;/usr/local/google/home/cpilch/Android/android-sdk_image-builds/build-tools/23.0.2;/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin;C:\\Program Files\\GnuWin32\\bin;C:\\Program Files (x86)\\GnuWin32\\bin;C:\\cygwin\\bin;C:\\cygwin64\\bin;C:\\ProgramData\\Oracle\\Java\\javapath" }, "name": "Run Emulator UI Test", - "stderr": "65b3fb6f16d3440daaa59065abc2e103", + "stderr": "3612083a553e4ae1b9e92611512aa555", "~followup_annotations": [ "@@@STEP_LINK@[Report] PASS: UI_TestCase@..\\..\\..\\UI_Result\\Win_UI_sysimg-oc\\build_1090-rev_4695513\\UI_TestCase_report\\index.html@@@" ] diff --git a/build/scripts/slave/recipes/adt/adt.expected/win64-emu-master-dev.json b/build/scripts/slave/recipes/adt/adt.expected/win64-emu-master-dev.json index 9593d0b8..6e4bf333 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/win64-emu-master-dev.json +++ b/build/scripts/slave/recipes/adt/adt.expected/win64-emu-master-dev.json @@ -67,7 +67,9 @@ "--emulator", "emu-master-dev\\emulator\\emulator", "--session_dir", - "('logs-build_1090-rev_4696395', 'boot_test_public_sysimage-emu-master-dev')", + "logs-build_1090-rev_4696395", + "--test_dir", + "boot_test_public_sysimage-emu-master-dev", "--file_pattern", "test_boot.*", "--config_file", @@ -84,7 +86,7 @@ "PATH": "%(PATH)s;/usr/local/google/home/cpilch/Android/android-sdk_public/tools;/usr/local/google/home/cpilch/Android/android-sdk_public/tools/bin;/usr/local/google/home/cpilch/Android/android-sdk_public/platform-tools;/usr/local/google/home/cpilch/Android/android-sdk_public/build-tools/23.0.2;/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin;C:\\Program Files\\GnuWin32\\bin;C:\\Program Files (x86)\\GnuWin32\\bin;C:\\cygwin\\bin;C:\\cygwin64\\bin;C:\\ProgramData\\Oracle\\Java\\javapath" }, "name": "Boot Test - public System Image - emu-master-dev", - "stderr": "cb0ead8c201248d6bc6ee283bc957416" + "stderr": "121dc5716b344831a80a34077737d1d4" }, { "cmd": [ diff --git a/build/scripts/slave/recipes/adt/adt.expected/windows-Console.json b/build/scripts/slave/recipes/adt/adt.expected/windows-Console.json index 59c92cfd..8778ba70 100644 --- a/build/scripts/slave/recipes/adt/adt.expected/windows-Console.json +++ b/build/scripts/slave/recipes/adt/adt.expected/windows-Console.json @@ -47,7 +47,9 @@ "--emulator", "emu-master-dev\\emulator\\emulator", "--session_dir", - "logs-build_516-rev_4696395\\Console_test", + "logs-build_516-rev_4696395", + "--test_dir", + "Console_test", "--file_pattern", "test_console.*", "--config_file", @@ -65,7 +67,7 @@ "PATH": "%(PATH)s;/usr/local/google/home/cpilch/Android/android-sdk_public/tools;/usr/local/google/home/cpilch/Android/android-sdk_public/tools/bin;/usr/local/google/home/cpilch/Android/android-sdk_public/platform-tools;/usr/local/google/home/cpilch/Android/android-sdk_public/build-tools/23.0.2;/usr/local/google/home/cpilch/bin/jdk1.8.0_121/bin;C:\\Program Files\\GnuWin32\\bin;C:\\Program Files (x86)\\GnuWin32\\bin;C:\\cygwin\\bin;C:\\cygwin64\\bin;C:\\ProgramData\\Oracle\\Java\\javapath" }, "name": "Run Emulator Console Test", - "stderr": "c4bbb3a2cc2f401ab0ad27a432241f6a", + "stderr": "9b2bab4b235745929ed248740fb3b73a", "~followup_annotations": [ "@@@STEP_LINK@View XML@..\\..\\..\\Console_Result\\Win_Console_emu-master-dev\\build_516-rev_4696395\\consoleTestResult.xml@@@" ] diff --git a/build/scripts/slave/recipes/adt/adt.py b/build/scripts/slave/recipes/adt/adt.py index 46c7aeef..df7fb8db 100644 --- a/build/scripts/slave/recipes/adt/adt.py +++ b/build/scripts/slave/recipes/adt/adt.py @@ -311,8 +311,8 @@ def RunSteps(api): if not is_cts and not is_ui and not is_console and not is_avd: step_data = BOOT_STEPS[step] api.adt.PythonTestStep('Boot Test - %s System Image - %s' % (step_data.description, emu_desc), - api.path.join((log_dir, 'boot_test_%s_sysimage-%s' % - (step_data.description, emu_desc))), + log_dir, + 'boot_test_%s_sysimage-%s' % (step_data.description, emu_desc), 'test_boot.*', 'boot_cfg.csv', step_data.filter, @@ -321,7 +321,8 @@ def RunSteps(api): elif is_ui: step_data = BOOT_STEPS[step] res = api.adt.PythonTestStep('Run Emulator UI Test', - api.path.join(log_dir, 'UI_test'), + log_dir, + 'UI_test', 'test_ui.*', 'ui_cfg.csv', step_data.filter, @@ -348,7 +349,8 @@ def RunSteps(api): api.python("Upload Test Results to GCS", upload_data_path, upload_data_args, env=env) elif is_console: res = api.adt.PythonTestStep('Run Emulator Console Test', - api.path.join(log_dir, 'Console_test'), + log_dir, + 'Console_test', 'test_console.*', 'console_cfg.csv', '{"gpu": "yes"}', @@ -376,7 +378,8 @@ def RunSteps(api): elif is_avd: api.adt.PythonTestStep('Run AVD Launch Test', - api.path.join(log_dir, 'AVD_test'), + log_dir, + 'AVD_test', 'launch_avd.*', 'avd_cfg.csv', '{"gpu": "yes"}', @@ -387,7 +390,8 @@ def RunSteps(api): if is_cts: emulator_path = api.path.join('emu-master-dev', 'emulator', 'emulator') api.adt.PythonTestStep('Run Emulator CTS Test', - api.path.join(log_dir, 'CTS_test'), + log_dir, + 'CTS_test', 'test_cts.*', 'cts_cfg.csv', '{}', @@ -396,7 +400,8 @@ def RunSteps(api): True) api.adt.PythonTestStep('Run Emulator GTS Test', - api.path.join(log_dir, 'GTS_test'), + log_dir, + 'GTS_test', 'test_cts.*', 'cts_cfg.csv', '{}', diff --git a/build/scripts/slave/recipes/adt/sysimage_release_psq.expected/linux-sysimage-release-psq.json b/build/scripts/slave/recipes/adt/sysimage_release_psq.expected/linux-sysimage-release-psq.json index 1f0479a6..a04abbe7 100644 --- a/build/scripts/slave/recipes/adt/sysimage_release_psq.expected/linux-sysimage-release-psq.json +++ b/build/scripts/slave/recipes/adt/sysimage_release_psq.expected/linux-sysimage-release-psq.json @@ -58,7 +58,9 @@ "--emulator", "/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools/emulator", "--session_dir", - "logs-build_516-rev_4696395/UI_test", + "logs-build_516-rev_4696395", + "--test_dir", + "UI_test", "--file_pattern", "test_ui.*", "--config_file", @@ -76,7 +78,7 @@ "PATH": "%(PATH)s:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/platform-tools:/usr/local/google/home/cpilch/Android/android-sdk-linux_image-builds/build-tools/23.0.2" }, "name": "Run System Image UI Test", - "stderr": "1462c68133274dc080470a3309f67709", + "stderr": "80638778d4c04efaaf3a30f913289d33", "~followup_annotations": [ "@@@STEP_LINK@[Report] PASS: UI_TestCase@../../../UI_Result/Ubuntu_System_Image_Release/build_516-rev_4696395/UI_TestCase_report/index.html@@@" ] diff --git a/build/scripts/slave/recipes/adt/sysimage_release_psq.py b/build/scripts/slave/recipes/adt/sysimage_release_psq.py index a4223562..8f81f5af 100644 --- a/build/scripts/slave/recipes/adt/sysimage_release_psq.py +++ b/build/scripts/slave/recipes/adt/sysimage_release_psq.py @@ -189,7 +189,8 @@ def RunSteps(api): with api.step.defer_results(): api.adt.PythonTestStep('Run System Image UI Test', - api.path.join(log_dir, 'UI_test'), + log_dir, + 'UI_test', 'test_ui.*', 'config.csv', # We run only x86 images for UI tests. |