From de3f4d64b453ea98847ff3b11c223a57dfae7c0b Mon Sep 17 00:00:00 2001 From: David McMahon Date: Mon, 4 Jan 2010 15:30:13 -0800 Subject: [PATCH 1/5] Fix bug introduced by http://codereview.chromium.org/520004 in archive_build.sh step. Review URL: http://codereview.chromium.org/525014 --- install_packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install_packages.sh b/install_packages.sh index 155e6aeaab..6e99204f05 100755 --- a/install_packages.sh +++ b/install_packages.sh @@ -191,6 +191,8 @@ sudo APT_CONFIG="$APT_CONFIG" apt-get --force-yes \ # TODO: The cache was populated by debootstrap, not these installs. Remove # this line when we can get debootstrap to stop doing this. sudo rm -f "${ROOT_FS_DIR}"/var/cache/apt/archives/*.deb +# Need to rm read-only created lock files in order for archiving step to work +sudo rm -rf "$APT_CACHE_DIR" # List all packages installed so far, since these are what the local # repository needs to contain. From fae2db8c2d43b4ccfd6f10660ae48ff4b392bd61 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Mon, 4 Jan 2010 16:06:33 -0800 Subject: [PATCH 2/5] rename connman and move it to it's own repo Review URL: http://codereview.chromium.org/525015 --- build_platform_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_platform_packages.sh b/build_platform_packages.sh index 845c125fea..c8db296628 100755 --- a/build_platform_packages.sh +++ b/build_platform_packages.sh @@ -33,7 +33,7 @@ PLATFORM_DIRS="acpi assets fake_hal init installer login_manager \ theme metrics_daemon" THIRD_PARTY_DIR="$SRC_ROOT/third_party" -THIRD_PARTY_PACKAGES="connman e2fsprogs/files \ +THIRD_PARTY_PACKAGES="e2fsprogs/files flimflam \ gflags google-breakpad gpt gtest \ ibus ibus-chewing ibus-anthy ibus-hangul ibus-m17n \ ply-image slim/src synaptics \ From 8fe80a30e1a9a10e40f3b9a6c3b4bffda95fe1dd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 5 Jan 2010 20:37:35 +0000 Subject: [PATCH 3/5] Build dh-chromeos dh-chromeos was originally intended for use once we switch to chromiumos-build, but it turns out that it would be useful to be able to use it beforehand to correct some cross-build problems. Accordingly, give it a make_pkg.sh file and add it to build_platform_packages.sh. Review URL: http://codereview.chromium.org/525030 --- build_platform_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_platform_packages.sh b/build_platform_packages.sh index c8db296628..38942f4f73 100755 --- a/build_platform_packages.sh +++ b/build_platform_packages.sh @@ -26,7 +26,7 @@ NUM_JOBS=`grep -c "^processor" /proc/cpuinfo` PLATFORM_DIR="$SRC_ROOT/platform" -PLATFORM_DIRS="acpi assets fake_hal init installer login_manager \ +PLATFORM_DIRS="acpi assets dh-chromeos fake_hal init installer login_manager \ memento_softwareupdate pam_google window_manager \ cros chrome screenlocker cryptohome \ monitor_reconfig microbenchmark minijail metrics_collection \ From 29ffbc309710cb9ef7b5a61bed5b59064008a2d7 Mon Sep 17 00:00:00 2001 From: Sean O'Connor Date: Tue, 5 Jan 2010 15:33:28 -0800 Subject: [PATCH 4/5] add script to drive setup and execution of autotest suites from dev environment Review URL: http://codereview.chromium.org/502009 --- setup_autotest.sh | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100755 setup_autotest.sh diff --git a/setup_autotest.sh b/setup_autotest.sh new file mode 100755 index 0000000000..165830957b --- /dev/null +++ b/setup_autotest.sh @@ -0,0 +1,102 @@ +#!/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. + +# Script to install and launch autotest. + +. "$(dirname "$0")/common.sh" + +# Script must be run inside the chroot +assert_inside_chroot + +DEFINE_string client_control "" "client test case to execute" "c" +DEFINE_boolean force false "force reinstallation of autotest" "f" +DEFINE_string machine "" "if present, execute autotest on this host." "m" +DEFINE_string test_key "${GCLIENT_ROOT}/src/platform/testing/testing_rsa" \ +"rsa key to use for autoserv" "k" + +# More useful help +FLAGS_HELP="usage: $0 [flags]" + +# parse the command-line +FLAGS "$@" || exit 1 +eval set -- "${FLAGS_ARGV}" +set -e + +AUTOTEST_CHROOT_DEST="/usr/local/autotest" +AUTOTEST_SRC="${GCLIENT_ROOT}/src/third_party/autotest/files" +echo $AUTOTEST_SRC + +CHROOT_AUTHSOCK_PREFIX="/tmp/chromiumos_test_agent" + +function cleanup { + if [ "${TEST_AUTH_SOCKET:0:26}" == ${CHROOT_AUTHSOCK_PREFIX} ] + then + echo "cleaning up chrooted ssh-agent." + kill ${SSH_AGENT_PID} + fi +} + +trap cleanup EXIT + +# Copy a local "installation" of autotest into the chroot, to avoid +# polluting the src dir with tmp files, results, etc. +# TODO: use rsync to ensure we don't get stuck with an old install. +if [ 1 != ${FLAGS_force} ] || [ ! -f "${AUTOTEST_CHROOT_DEST}/server/autosrv" ] + then + echo -n "Installing Autotest... " + sudo mkdir -p "${AUTOTEST_CHROOT_DEST}" + sudo cp -rp ${AUTOTEST_SRC}/* ${AUTOTEST_CHROOT_DEST} + echo "done." + else + echo "Autotest found in chroot, skipping copy." +fi + +# Add all third_party and system tests to site_tests. +for type in client server +do + echo -n "Adding ${type}_tests into autotest's ${type}/site_tests... " + sudo cp -rp ${GCLIENT_ROOT}/src/platform/testing/${type}_tests/* \ + ${AUTOTEST_CHROOT_DEST}/${type}/site_tests/ +done + +# If ssh-agent isn't already running, start one (possibly inside the chroot) +if [ ! -n "${SSH_AGENT_PID}" ] +then + echo "Setting up ssh-agent in chroot for testing." + TEST_AUTH_SOCKET=$(mktemp -u ${CHROOT_AUTHSOCK_PREFIX}.XXXX) + eval $(/usr/bin/ssh-agent -a ${TEST_AUTH_SOCKET}) +fi + +# Install authkey for testing + +chmod 400 $FLAGS_test_key +/usr/bin/ssh-add $FLAGS_test_key 2> /dev/null + +if [ -n "${FLAGS_machine}" ] +then + CLIENT_CONTROL_FILE=${FLAGS_client_control} + # run only a specific test/suite if requested + if [ ! -n "${CLIENT_CONTROL_FILE}" ] + then + # Generate meta-control file to run all existing site tests. + CLIENT_CONTROL_FILE=\ + "${AUTOTEST_CHROOT_DEST}/client/site_tests/AllTests/control" + echo "No control file specified. Running all tests." + fi + # Kick off autosrv for specified test + autoserv_cmd="${AUTOTEST_CHROOT_DEST}/server/autoserv \ + -m ${FLAGS_machine} \ + -c ${CLIENT_CONTROL_FILE}" + echo "running autoserv: " ${autoserv_cmd} + ${autoserv_cmd} +else + echo "To execute autotest manually: + eval \$(ssh-agent) # start ssh-agent + ssh-add $FLAGS_test_key # add test key to agent + # Then execute autoserv: + $autoserv_cmd" +fi + From 83ee7bbbd1fdd296b767415acd301a43a80f44e0 Mon Sep 17 00:00:00 2001 From: David McMahon Date: Tue, 5 Jan 2010 18:07:52 -0800 Subject: [PATCH 5/5] Created branch 26. Update CHROMEOS_VERSION_BRANCH=27 --- chromeos_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromeos_version.sh b/chromeos_version.sh index 10daed811e..711758ff48 100755 --- a/chromeos_version.sh +++ b/chromeos_version.sh @@ -26,7 +26,7 @@ export CHROMEOS_VERSION_MINOR=5 # Increment by 2 in trunk after making a release branch. # Does not reset on a major/minor change (always increases). # (Trunk is always odd; branches are always even). -export CHROMEOS_VERSION_BRANCH=25 +export CHROMEOS_VERSION_BRANCH=27 # Patch number. # Increment by 1 each release on a branch.