ferrochrome-tests: Fix ferrochrome image push path
This fixes regression caused by my previous commit:
d3388bb71 Ferrochrome: Match vm_config.json with custom_vm.md
.. which unexpectidly modified image push path.
Bug: 351065253
Test: atest ferrochrome-tests && ./ferrochrome.sh
Change-Id: I050438877ccb18a2cb3d1e71e3b15741311c8b10
diff --git a/tests/ferrochrome/AndroidTest.xml b/tests/ferrochrome/AndroidTest.xml
index 79cbe72..8053674 100644
--- a/tests/ferrochrome/AndroidTest.xml
+++ b/tests/ferrochrome/AndroidTest.xml
@@ -32,9 +32,9 @@
It's too large (6.5G+), so this may break further tests. -->
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="throw-if-cmd-fail" value="false" />
- <option name="run-command" value="mkdir /data/local/tmp/ferrochrome" />
+ <option name="run-command" value="mkdir /data/local/tmp" />
<option name="teardown-command" value="pkill vmlauncher" />
- <option name="teardown-command" value="rm -rf /data/local/tmp/ferrochrome" />
+ <option name="teardown-command" value="rm /data/local/tmp/chromiumos_test_image.bin" />
</target_preparer>
<test class="com.android.tradefed.testtype.binary.ExecutableHostTest" >
diff --git a/tests/ferrochrome/ferrochrome.sh b/tests/ferrochrome/ferrochrome.sh
index 6814ac5..72b5433 100755
--- a/tests/ferrochrome/ferrochrome.sh
+++ b/tests/ferrochrome/ferrochrome.sh
@@ -21,7 +21,7 @@
FECR_GS_URL="https://storage.googleapis.com/chromiumos-image-archive/ferrochrome-public"
FECR_DEFAULT_VERSION="R127-15916.0.0"
-FECR_DEVICE_DIR="/data/local/tmp/ferrochrome"
+FECR_DEVICE_DIR="/data/local/tmp"
FECR_CONFIG_PATH="/data/local/tmp/vm_config.json" # hardcoded at VmLauncherApp
FECR_CONSOLE_LOG_PATH="/data/data/\${pkg_name}/files/console.log"
FECR_BOOT_COMPLETED_LOG="Have fun and send patches!"