From 5db44aa611c1b695e60a757e59afba74b7accf57 Mon Sep 17 00:00:00 2001 From: "kwaters@google.com" Date: Thu, 19 Nov 2009 22:31:21 +0000 Subject: [PATCH] Add fio based autotest cases. - Rev chromeos-systemtests, and add fio as a dependency. - Add fio into the image during mod_image_for_test.sh Review URL: http://chromereview.prom.corp.google.com/1180028 git-svn-id: svn://chrome-svn/chromeos/trunk@297 06c00378-0e64-4dae-be16-12b19f9950a1 --- mod_for_test_scripts/400installFio | 10 ++++++++++ mod_for_test_scripts/b100fio | 12 ++++++++++++ mod_for_test_scripts/b101libaio1 | 7 +++++++ mod_image_for_test.sh | 10 +++++++++- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 mod_for_test_scripts/400installFio create mode 100644 mod_for_test_scripts/b100fio create mode 100644 mod_for_test_scripts/b101libaio1 diff --git a/mod_for_test_scripts/400installFio b/mod_for_test_scripts/400installFio new file mode 100755 index 0000000000..dc365bf835 --- /dev/null +++ b/mod_for_test_scripts/400installFio @@ -0,0 +1,10 @@ +#!/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. + +# Install fio and libaio1 +dpkg --install /modify_build/libaio1_*.deb +dpkg --install /modify_build/fio_*.deb + diff --git a/mod_for_test_scripts/b100fio b/mod_for_test_scripts/b100fio new file mode 100644 index 0000000000..1627aa3c28 --- /dev/null +++ b/mod_for_test_scripts/b100fio @@ -0,0 +1,12 @@ +# 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. + +# build fio +pushd "${GCLIENT_ROOT}/src/third_party/fio" +./make_pkg.sh +popd + +sudo cp "${DEFAULT_BUILD_ROOT}"/x86/local_packages/fio_*.deb \ + "${ROOT_FS_DIR}/modify_build/" + diff --git a/mod_for_test_scripts/b101libaio1 b/mod_for_test_scripts/b101libaio1 new file mode 100644 index 0000000000..ece2082d9e --- /dev/null +++ b/mod_for_test_scripts/b101libaio1 @@ -0,0 +1,7 @@ +# 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. + +sudo cp "${DEFAULT_IMG_MIRROR#*://}"/pool/main/liba/libaio/libaio1_*.deb \ + "${ROOT_FS_DIR}/modify_build" + diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh index 29a5586688..8827b2e481 100755 --- a/mod_image_for_test.sh +++ b/mod_image_for_test.sh @@ -61,15 +61,23 @@ LOOP_DEV=`sudo losetup -f` sudo losetup "${LOOP_DEV}" "${FLAGS_image}" sudo mount "${LOOP_DEV}" "${ROOT_FS_DIR}" +# Run build steps for modify for test +sudo mkdir -p "${ROOT_FS_DIR}/modify_build" +scripts_dir="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts" +for script in "${scripts_dir}"/b[0-9][0-9][0-9]*[!$~]; do + . ${script} +done + MOD_SCRIPTS_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts" sudo mkdir -p "${ROOT_FS_DIR}/modify_scripts" sudo mount --bind "${MOD_SCRIPTS_ROOT}" "${ROOT_FS_DIR}/modify_scripts" # Run test setup script inside chroot jail to modify the image sudo chroot "${ROOT_FS_DIR}" "/modify_scripts/test_setup.sh" - + sudo umount "${ROOT_FS_DIR}/modify_scripts" sudo rmdir "${ROOT_FS_DIR}/modify_scripts" +sudo rm -rf "${ROOT_FS_DIR}/modify_build" cleanup trap - EXIT