From 0538571ce110efda24180d31b3cdd00c5cdfbc95 Mon Sep 17 00:00:00 2001 From: Chris Sosa Date: Tue, 11 Sep 2012 15:04:41 -0700 Subject: [PATCH] Deprecate for_test upstart jobs by building and installing test/dev init pkgs. We also remove some dead mod_for_test scripts. BUG=chromium-os:9729, chromium-os:14091 TEST=build_packages, build_image dev test CQ-DEPEND=If58678ab4fe7abd9142a619850be07249d159781 Change-Id: Iff6a143dbf8ce58878dc1b07629c52bbb7f02ded Reviewed-on: https://gerrit.chromium.org/gerrit/32998 Reviewed-by: Chris Sosa Tested-by: Chris Sosa Commit-Ready: Chris Sosa --- build_library/dev_image_util.sh | 3 +++ build_library/test_image_util.sh | 1 + build_packages | 2 ++ mod_for_test_scripts/400modifyUpstart | 11 ----------- mod_for_test_scripts/900mountHomeExec | 9 --------- 5 files changed, 6 insertions(+), 20 deletions(-) delete mode 100755 mod_for_test_scripts/400modifyUpstart delete mode 100755 mod_for_test_scripts/900mountHomeExec diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh index e46f57bf2a..d80a0993ea 100755 --- a/build_library/dev_image_util.sh +++ b/build_library/dev_image_util.sh @@ -22,6 +22,9 @@ install_dev_packages() { # Determine the root dir for developer packages. local root_dev_dir="${ROOT_FS_DIR}/usr/local" + # Install dev-specific init scripts into / from chromeos-dev-init. + emerge_to_image --root="${ROOT_FS_DIR}" chromeos-dev-init + # Install developer packages described in chromeos-dev. emerge_to_image --root="${root_dev_dir}" chromeos-dev diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh index 4173451140..112114c30a 100755 --- a/build_library/test_image_util.sh +++ b/build_library/test_image_util.sh @@ -77,6 +77,7 @@ emerge_chromeos_test() { # Determine the root dir for test packages. local root_dev_dir="${ROOT_FS_DIR}/usr/local" + emerge_to_image --root="${ROOT_FS_DIR}" chromeos-test-init emerge_to_image --root="${root_dev_dir}" chromeos-test } diff --git a/build_packages b/build_packages index 6802291cf4..49365c4d2c 100755 --- a/build_packages +++ b/build_packages @@ -155,6 +155,7 @@ if [[ $# -eq 0 ]]; then PACKAGES=( chromeos-base/chromeos ) if [[ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]]; then PACKAGES+=( chromeos-base/chromeos-dev ) + PACKAGES+=( chromeos-base/chromeos-dev-init ) fi if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then PACKAGES+=( chromeos-base/chromeos-factory ) @@ -164,6 +165,7 @@ if [[ $# -eq 0 ]]; then fi if [[ "${FLAGS_withtest}" -eq "${FLAGS_TRUE}" ]]; then PACKAGES+=( chromeos-base/chromeos-test ) + PACKAGES+=( chromeos-base/chromeos-test-init ) fi if [[ "${FLAGS_withautotest}" -eq "${FLAGS_TRUE}" ]]; then PACKAGES+=( chromeos-base/autotest-all ) diff --git a/mod_for_test_scripts/400modifyUpstart b/mod_for_test_scripts/400modifyUpstart deleted file mode 100755 index b9fecdec84..0000000000 --- a/mod_for_test_scripts/400modifyUpstart +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -echo "Modifying upstart scripts for test accessibility." -for script in "${ROOT_FS_DIR}/etc/init/*.conf"; do - sed -i 's/#for_test //' ${script} -done - diff --git a/mod_for_test_scripts/900mountHomeExec b/mod_for_test_scripts/900mountHomeExec deleted file mode 100755 index bc609673b8..0000000000 --- a/mod_for_test_scripts/900mountHomeExec +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Create a marker file indicating that we are in mod_for_test -echo "Setting /home to be mounted exec" -sed -i -e 's/#mod_for_test#//g' ${ROOT_FS_DIR}/sbin/chromeos_startup