Index: /trunk/src/VBox/Installer/linux/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/linux/Makefile.kmk (revision 58344) +++ /trunk/src/VBox/Installer/linux/Makefile.kmk (revision 58345) @@ -364,5 +364,4 @@ $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \ $(VBOX_LNX_INST_OUT_DIR)/install.sh \ - $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh \ $$(linux-scripts_2_STAGE_TARGETS) $(call MSG_TOOL,makeself,,$@) @@ -374,5 +373,5 @@ "VirtualBox for Linux installation" ./install.sh "\$$0 1> /dev/null" -$(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@) +$(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@) $(QUIET)$(SED) \ -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \ @@ -384,8 +383,4 @@ -e "s;_USERNAME_;$(USERNAME);g" \ -e "s;_PYTHON_;$(VBOX_WITH_PYTHON);g" \ - -e '/#include installer-common.sh/ {' \ - -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-common.sh" \ - -e 'd' \ - -e '}' \ --output $@ \ $< Index: unk/src/VBox/Installer/linux/installer-common.sh =================================================================== --- /trunk/src/VBox/Installer/linux/installer-common.sh (revision 58344) +++ (revision ) @@ -1,176 +1,0 @@ -# Oracle VM VirtualBox -# VirtualBox installer shell routines -# - -# Copyright (C) 2007-2015 Oracle Corporation -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License (GPL) as published by the Free Software -# Foundation, in version 2 as it comes in the "COPYING" file of the -# VirtualBox OSE distribution. VirtualBox OSE is distributed in the -# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -# - -## @todo Make this file into a script in the VirtualBox lib directory once -# enough code has been made shared between the different installers. - -# This is used for unit testing and will be reset after the file is sourced for -# test runs. -unset EXTERN - -udev_write_vboxdrv() { - VBOXDRV_GRP="$1" - VBOXDRV_MODE="$2" - - echo "KERNEL==\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\"" - echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"root\", MODE=\"0666\"" - echo "KERNEL==\"vboxnetctl\", NAME=\"vboxnetctl\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\"" -} - -udev_write_usb() { - INSTALLATION_DIR="$1" - USB_GROUP="$2" - - echo "SUBSYSTEM==\"usb_device\", ACTION==\"add\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\"" - echo "SUBSYSTEM==\"usb\", ACTION==\"add\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\"" - echo "SUBSYSTEM==\"usb_device\", ACTION==\"remove\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\"" - echo "SUBSYSTEM==\"usb\", ACTION==\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\"" -} - -generate_udev_rule() { - VBOXDRV_GRP="$1" # The group owning the vboxdrv device - VBOXDRV_MODE="$2" # The access mode for the vboxdrv device - INSTALLATION_DIR="$3" # The directory VirtualBox is installed in - USB_GROUP="$4" # The group that has permission to access USB devices - NO_INSTALL="$5" # Set this to "1" to remove but not re-install rules - UDEV_STRING="$6" # The output of the udev version command - - # Extra space! - case "$USB_GROUP" in ?*) USB_GROUP=" $USB_GROUP" ;; esac - case "$NO_INSTALL" in - "1") ;; - *) - udev_ver=`expr "$UDEV_STRING" : '[^0-9]*\([0-9]*\)'` - udev_fix="" - test "$udev_ver" = "" -o "$udev_ver" -lt 55 && - udev_fix="1" - udev_do_usb="" - test "$udev_ver" -ge 59 && - udev_do_usb="1" - case "$udev_fix" in - "1") - udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE" | - sed 's/\([^+=]*\)[+=]*\([^"]*"[^"]*"\)/\1=\2/g' - ;; - *) - udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE" - case "$udev_do_usb" in "1") - udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP" ;; - esac - ;; - esac - ;; - esac -} - -install_udev() { - # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox) for distribution packages - VBOXDRV_GRP="$1" # The group owning the vboxdrv device - VBOXDRV_MODE="$2" # The access mode for the vboxdrv device - INSTALLATION_DIR="$3" # The directory VirtualBox is installed in - USB_GROUP="$4" # The group that has permission to access USB devices - NO_INSTALL="$5" # Set this to "1" to remove but not re-install rules - - if test -d /etc/udev/rules.d; then - udev_out="`udevadm version 2>/dev/null || udevinfo -V 2>/dev/null`" - generate_udev_rule "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \ - "$USB_GROUP" "$NO_INSTALL" "$udev_out" - fi - # Remove old udev description file - rm -f /etc/udev/rules.d/10-vboxdrv.rules 2> /dev/null -} - -# Add a unit test if/when needed following the same pattern as for -# install_udev. - -install_create_usb_node_for_sysfs() { - # Create a usb device node for a given sysfs path - path="$1" # sysfs path for the device - usb_createnode="$2" # Path to the USB device node creation script - usb_group="$3" # The group to give ownership of the node to - if $EXTERN test -r "${path}/dev"; then - dev="`$EXTERN cat "${path}/dev" 2> /dev/null`" - major="`expr "$dev" : '\(.*\):' 2> /dev/null`" - minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null`" - class="`$EXTERN cat ${path}/bDeviceClass 2> /dev/null`" - $EXTERN sh "${usb_createnode}" "$major" "$minor" "$class" \ - "${usb_group}" 2>/dev/null - fi -} - -# install_device_node_setup contains some aliases for unit testing purposes. # Set them to their normal values here. -udev_rule_file=/etc/udev/rules.d/60-vboxdrv.rules # Set this to /dev/null - # for unit testing -sysfs_usb_devices="/sys/bus/usb/devices/*" - -install_device_node_setup() { - # Install udev rules and create device nodes for usb access - # To unit test, set $EXTERN to point to a function simulating these - # functions (defined further up in this file): install_udev; - # install_create_usb_node_for_sysfs. See the code for usage. - VBOXDRV_GRP="$1" # The group that should own /dev/vboxdrv - VBOXDRV_MODE="$2" # The mode to be used for /dev/vboxdrv - INSTALLATION_DIR="$3" # The directory VirtualBox is installed in - USB_GROUP="$4" # The group that should own the /dev/vboxusb device - # nodes unless INSTALL_NO_GROUP=1 in - # /etc/default/virtualbox. Optional. - usb_createnode="$INSTALLATION_DIR/VBoxCreateUSBNode.sh" - # install udev rule (disable with INSTALL_NO_UDEV=1 in - # /etc/default/virtualbox) - if [ "$INSTALL_NO_GROUP" != "1" ]; then - usb_group=$USB_GROUP - vboxdrv_group=$VBOXDRV_GRP - else - usb_group=root - vboxdrv_group=root - fi - $EXTERN install_udev "${vboxdrv_group}" "$VBOXDRV_MODE" \ - "$INSTALLATION_DIR" "${usb_group}" \ - "$INSTALL_NO_UDEV" > ${udev_rule_file} - # Build our device tree - for i in ${sysfs_usb_devices}; do # This line intentionally without quotes. - $EXTERN install_create_usb_node_for_sysfs "$i" "${usb_createnode}" \ - "${usb_group}" - done -} - -set_selinux_permissions() { - # XXX SELinux: allow text relocation entries - INSTALLATION_DIR="$1" # Where the VirtualBox binaries are installed to - SHARE_DIR="$2" # Where shared bits are installed to - if [ -x /usr/bin/chcon ]; then - chcon -t texrel_shlib_t "$INSTALLATION_DIR"/*VBox* > /dev/null 2>&1 - chcon -t texrel_shlib_t "$INSTALLATION_DIR"/VBoxAuth.so \ - > /dev/null 2>&1 - chcon -t texrel_shlib_t "$INSTALLATION_DIR"/VirtualBox.so \ - > /dev/null 2>&1 - chcon -t texrel_shlib_t "$INSTALLATION_DIR"/components/VBox*.so \ - > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/VirtualBox > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxSDL > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxHeadless \ - > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxNetDHCP \ - > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxNetNAT \ - > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxExtPackHelperApp \ - > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/vboxwebsrv > /dev/null 2>&1 - chcon -t java_exec_t "$INSTALLATION_DIR"/webtest > /dev/null 2>&1 - chcon -t bin_t "$SHARE_DIR"/src/vboxhost/build_in_tmp \ - > /dev/null 2>&1 - fi -} Index: /trunk/src/VBox/Installer/linux/testcase/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/linux/testcase/Makefile.kmk (revision 58344) +++ /trunk/src/VBox/Installer/linux/testcase/Makefile.kmk (revision 58345) @@ -19,24 +19,4 @@ include $(KBUILD_PATH)/subheader.kmk -INSTALLS += tstInstallerLinux -TESTING += tstInstallerLinux -tstInstallerLinux_INST = $(INST_TESTCASE) -tstInstallerLinux_MODE = a+rx,u+w -tstInstallerLinux_SOURCES = $(tstInstallerLinux_0_OUTDIR)/tstInstallerLinux.sh -tstInstallerLinux_CLEAN = $(tstInstallerLinux_0_OUTDIR)/tstInstallerLinux.sh - -$$(tstInstallerLinux_0_OUTDIR)/tstInstallerLinux.sh: \ - $(PATH_SUB_CURRENT)/tstInstallerLinux.sh \ - $(PATH_SUB_CURRENT)/../installer-common.sh \ - | $$(dir $$@) - $(QUIET)$(SED) \ - -e '/#include installer-common.sh/ {' \ - -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-common.sh" \ - -e 'd' \ - -e '}' \ - --output $@ \ - $< - $(QUIET)$(CHMOD) a+rx,u+w $@ - INSTALLS += tstHeadlessXOrg TESTING += tstHeadlessXOrg @@ -45,9 +25,3 @@ tstHeadlessXOrg_SOURCES = tstHeadlessXOrg.sh -INSTALLS += tstInstallInit -TESTING += tstInstallInit -tstInstallInit_INST = $(INST_TESTCASE) -tstInstallInit_MODE = a+rx,u+w -tstInstallInit_SOURCES = tstInstallInit.sh - include $(FILE_KBUILD_SUB_FOOTER) Index: unk/src/VBox/Installer/linux/testcase/tstInstallInit.sh =================================================================== --- /trunk/src/VBox/Installer/linux/testcase/tstInstallInit.sh (revision 58344) +++ (revision ) @@ -1,365 +1,0 @@ -#!/bin/sh -# $Id$ -## @file -# VirtualBox init file creator unit test. -# - -# -# Copyright (C) 2012-2015 Oracle Corporation -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License (GPL) as published by the Free Software -# Foundation, in version 2 as it comes in the "COPYING" file of the -# VirtualBox OSE distribution. VirtualBox OSE is distributed in the -# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -# - -# This will initially be a skeleton with a couple of tests - add more for quick -# debugging when you suspect that something isn't working as specified. - -tab=" " -tmpbase="/tmp/tstInstallInit 99" # Space in the name for a little stress... -if [ -n "${TESTBOX_PATH_SCRATCH}" ]; then - tmpbase="${TESTBOX_PATH_SCRATCH}/tstInstallInit 99" -fi - -## The function definition at the start of every non-trivial shell script! -abort() -{ - ## $1 Error text to output to standard error in printf format. - cat >&2 << EOF -${TEST_NAME}: $1 -EOF - exit 1 -} - -## Print a TESTING line. -print_line() -{ - cat >&2 << EOF -${TEST_NAME}: TESTING $1 -EOF -} - -## Set the failure message if it is not yet set. -fail_msg() -{ - test -z "${failed}" && failed="FAILED: ${1}" -} - -# Get the directory where the script is located and the parent. -OUR_FOLDER=`dirname "$0"` -OUR_FOLDER=`cd "${OUR_FOLDER}" && pwd` -VBOX_FOLDER=`cd "${OUR_FOLDER}/.." && pwd` -[ -d "${VBOX_FOLDER}" ] || - abort "Failed to change to directory ${VBOX_FOLDER}.\n" -cd "${VBOX_FOLDER}" - -# Get our name for output. -TEST_NAME="$(basename "$0" .sh)" - -# Create a trivial test service in temporary directory $1 with name $2. -test_service() -{ - cat > "${1}/${2}" << EOF -#!/bin/sh -trap "touch \"${1}/stopped\"; exit" TERM -echo "1: \${1} 2: \${2} 3: \${3}" > "${1}/started" -while true; do true; done -EOF -chmod u+x "${1}/${2}" -} - -# Create a trivial test command in temporary directory $1 with name $2. -test_oneshot() -{ - cat > "${1}/${2}" << EOF -#!/bin/sh -if test "\${1}" = start; then - touch "${1}/started" -else - rm "${1}/started" -fi -exit 0 -EOF -chmod u+x "${1}/${2}" -} - -# Test some dodgy input values against generate_service_file. -# Make sure there is a substitution pattern at the end too. -print_line "generation of shell script from template." -input='TEST1%DESCRIPTION%%%%SERVICE_NAME%%STOP_COMMAND% TST2 TEST %ARGUMENTS%%COMMAND%' -out=`echo "${input}" | - helpers/generate_service_file --command '/usr/bin -aries/hello -world' --arguments 'p\x0a0\n\ \t' --format shell --description ''` -expected='TEST1%hello -world TST2 TEST '\''p -0 - '"${tab}"\'\''/usr/bin -aries/hello -world'\' -case "${out}" in ${expected}) -echo "SUCCESS (1)";; -*) -cat << EOF -FAILED: expected -${expected} -but got -${out} -EOF -esac -input='TEST%HAVE_STOP_COMMAND%%SERVICE_NAME%%STOP_COMMAND% TST2 - TEST %COMMAND%' -out=`echo "${input}" | - helpers/generate_service_file --command '/usr/bin/hello' --format shell --description ''` -expected='TEST TEST '\''/usr/bin/hello'\''' -case "${out}" in ${expected}) -echo "SUCCESS (2)";; -*) -cat << EOF -FAILED: expected -${expected} -but got -${out} -EOF -esac -input='TEST%HAVE_STOP_COMMAND%%SERVICE_NAME%%STOP_COMMAND% %STOP_ARGUMENTS% TST2 - TEST %COMMAND%' -out=`echo "${input}" | - helpers/generate_service_file --command '/usr/bin/hello' --format shell --description '' --stop-command /usr/bin/stop --stop-arguments hello` -expected='TESThello'\''/usr/bin/stop'\'' '\''hello'\'' TST2 - TEST '\''/usr/bin/hello'\''' -case "${out}" in ${expected}) -echo "SUCCESS (3)";; -*) -cat << EOF -FAILED: expected -${expected} -but got -${out} -EOF -esac - -# Create a simulated init system layout. -create_simulated_init_tree() -{ - tmpdir="${1}" - rm -rf "${tmpdir}" - mkdir -m 0700 "${tmpdir}" || abort "Failed to create a temporary folder." - mkdir -p "${tmpdir}/init.d/" "${tmpdir}/rc.d/init.d/" - for i in 0 1 2 3 4 5 6; do - mkdir "${tmpdir}/rc${i}.d/" "${tmpdir}/rc.d/rc${i}.d/" - done - mkdir -p "${tmpdir}/runlevel/default" "${tmpdir}/runlevel/boot" - mkdir "${tmpdir}/run" -} - -# Test an init script installation. -print_line "installing an init script." -failed="" -# Create a simulated init system layout. -tmpdir="${tmpbase}0" -create_simulated_init_tree "${tmpdir}" -# Create the service binary. -test_service "${tmpdir}" "service" -# And install it. -scripts/install_service --prefix "${tmpdir}" --enable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -# Check that the main service file was created as specified. -if test -x "${tmpdir}/init.d/service"; then - grep "Short-Description: My description" "${tmpdir}/init.d/service" >/dev/null || - fail_msg "Description not set in \"${tmpdir}/init.d/service\"" -else - fail_msg "\"${tmpdir}/init.d/service\" not correctly created." -fi -test -x "${tmpdir}/init.d/rc.d/service" && - fail_msg "\"${tmpdir}/init.d/rc.d/service\" created but shouldn't have been." -# Try to start the service using the symbolic links which should have been -# created. -if "${tmpdir}/rc3.d/S20service" --prefix "${tmpdir}" --lsb-functions "" start >/dev/null 2>&1; then - if grep "1: test 2: of 3: my arguments" "${tmpdir}/started" >/dev/null; then - test -f "${tmpdir}/stopped" && - fail_msg "\"${tmpdir}/rc3.d/S20service\" stopped immediately." - else - fail_msg "\"${tmpdir}/rc3.d/S20service\" did not start correctly." - fi -else - fail_msg "could not start \"${tmpdir}/rc3.d/S20service\"." -fi -# Check the status. -"${tmpdir}/rc.d/rc5.d/S20service" --prefix "${tmpdir}" --lsb-functions "" status >/dev/null 2>&1 || - fail_msg "\"${tmpdir}/rc.d/rc5.d/S20service\" reported the wrong status." -# Try to stop the service using the symbolic links which should have been -# created. -if "${tmpdir}/rc.d/rc6.d/K80service" --prefix "${tmpdir}" --lsb-functions "" stop >/dev/null 2>&1; then - test -f "${tmpdir}/stopped" || - echo "\"${tmpdir}/rc.d/rc6.d/K80service\" did not stop correctly." -else - fail_msg "could not stop \"${tmpdir}/rc.d/rc6.d/K80service\"." -fi -# Check the status again - now it should be stopped. -"${tmpdir}/runlevel/service" --prefix "${tmpdir}" --lsb-functions "" status >/dev/null 2>&1 && - fail_msg "\"${tmpdir}/runlevel/service\" reported the wrong status." -# Final summary. -if test -n "${failed}"; then - echo "${failed}" -else - echo SUCCESS -fi - -# Test an one shot init script installation. -print_line "installing a one shot init script." -failed="" -# Create a simulated init system layout. -tmpdir="${tmpbase}0" -create_simulated_init_tree "${tmpdir}" -# Create the command binary. -test_oneshot "${tmpdir}" "command" -# And install the script. -scripts/install_service --prefix "${tmpdir}" --enable -- --command "${tmpdir}/command" --arguments "start" --description "My description" --stop-command "${tmpdir}/command" --stop-arguments "stop" --one-shot || - fail_msg "\"scripts/install_service\" failed." -# Sanity test. -test -f "${tmpdir}/started" && - fail_msg "\"${tmpdir}/started\" already exists!" -# Try to start the service using the symbolic links which should have been -# created. -if "${tmpdir}/rc3.d/S20command" --prefix "${tmpdir}" --lsb-functions "" start >/dev/null 2>&1; then - test -f "${tmpdir}/started" || - fail_msg "\"${tmpdir}/rc3.d/S20command\" did not start correctly." -else - fail_msg "could not start \"${tmpdir}/rc3.d/S20command\"." -fi -# Try to stop the service using the symbolic links which should have been -# created. -if "${tmpdir}/rc.d/rc6.d/K80command" --prefix "${tmpdir}" --lsb-functions "" stop >/dev/null 2>&1; then - test -f "${tmpdir}/started" && - echo "\"${tmpdir}/rc.d/rc6.d/K80command\" did not stop correctly." -else - fail_msg "could not stop \"${tmpdir}/rc.d/rc6.d/K80command\"." -fi -# Final summary. -if test -n "${failed}"; then - echo "${failed}" -else - echo SUCCESS -fi - -# Test an init script removal. -print_line "removing an init script." -failed="" -# Create a simulated init system layout. -tmpdir="${tmpbase}0" -create_simulated_init_tree "${tmpdir}" -# Create the service binary. -test_service "${tmpdir}" "service" -# Install it. -scripts/install_service --prefix "${tmpdir}" --enable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -# And remove it again. -scripts/install_service --prefix "${tmpdir}" --remove -- --command "${tmpdir}/service" || - fail_msg "\"scripts/install_service\" failed." -# After uninstallation this should be the only file left in the init tree. -rm "${tmpdir}/service" -test "x`find "${tmpdir}" -type f -o -type l`" = "x" || - fail_msg "not all files were removed." -# Final summary. -if test -n "${failed}"; then - echo "${failed}" -else - echo SUCCESS -fi - -# Test an enabled init script update with --disable. -print_line "updating an enabled init script with --disable." -failed="" -# Create a simulated init system layout. -tmpdir="${tmpbase}1" -create_simulated_init_tree "${tmpdir}" -# Create the service binary. -test_service "${tmpdir}" "service" -# Install it. -scripts/install_service --prefix "${tmpdir}" --enable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -# Install it disabled without forcing. -scripts/install_service --prefix "${tmpdir}" --disable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -test "x`find "${tmpdir}"/rc*.d "${tmpdir}/runlevel" -type l | wc -l`" = "x15" || - fail_msg "links were removed on non-forced disable." -# Final summary. -if test -n "${failed}"; then - echo "${failed}" -else - echo SUCCESS -fi - -# Test updating a disabled init script with --enable. -print_line "updating a disabled init script with --enable." -failed="" -# Create a simulated init system layout. -tmpdir="${tmpbase}2" -create_simulated_init_tree "${tmpdir}" -# Create the service binary. -test_service "${tmpdir}" "service" -# Install it. -scripts/install_service --prefix "${tmpdir}" --disable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -# Install it disabled without forcing. -scripts/install_service --prefix "${tmpdir}" --enable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -test "x`find "${tmpdir}"/rc*.d "${tmpdir}/runlevel" -type l`" = "x" || - fail_msg "files were installed on non-forced enable." -# Final summary. -if test -n "${failed}"; then - echo "${failed}" -else - echo SUCCESS -fi - -# Test an enabled init script update with --force-disable. -print_line "updating an enabled init script with --force-disable." -failed="" -# Create a simulated init system layout. -tmpdir="${tmpbase}3" -create_simulated_init_tree "${tmpdir}" -# Create the service binary. -test_service "${tmpdir}" "service" -# Install it. -scripts/install_service --prefix "${tmpdir}" --enable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -# Install it disabled without forcing. -scripts/install_service --prefix "${tmpdir}" --force-disable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -test "x`find "${tmpdir}"/rc*.d "${tmpdir}/runlevel" -type l`" = "x" || - fail_msg "links were not removed on forced disable." -# Final summary. -if test -n "${failed}"; then - echo "${failed}" -else - echo SUCCESS -fi - -# Test updating a disabled init script with --force-enable. -print_line "updating a disabled init script with --force-enable." -failed="" -# Create a simulated init system layout. -tmpdir="${tmpbase}4" -create_simulated_init_tree "${tmpdir}" -# Create the service binary. -test_service "${tmpdir}" "service" -# Install it. -scripts/install_service --prefix "${tmpdir}" --disable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -# Install it disabled without forcing. -scripts/install_service --prefix "${tmpdir}" --force-enable -- --command "${tmpdir}/service" --arguments "test of my\ arguments" --description "My description" || - fail_msg "\"scripts/install_service\" failed." -test "x`find "${tmpdir}"/rc*.d "${tmpdir}/runlevel" -type l | wc -l`" = "x15" || - fail_msg "files were not installed on forced enable." -# Final summary. -if test -n "${failed}"; then - echo "${failed}" -else - echo SUCCESS -fi Index: unk/src/VBox/Installer/linux/testcase/tstInstaller.sh =================================================================== --- /trunk/src/VBox/Installer/linux/testcase/tstInstaller.sh (revision 58344) +++ (revision ) @@ -1,66 +1,0 @@ -#!/bin/sh -# -# Oracle VM VirtualBox -# VirtualBox linux installation script unit test - -# -# Copyright (C) 2007-2015 Oracle Corporation -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License (GPL) as published by the Free Software -# Foundation, in version 2 as it comes in the "COPYING" file of the -# VirtualBox OSE distribution. VirtualBox OSE is distributed in the -# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -# - -#include installer-common.sh - -echo Testing udev rule generation - -setup_test_install_udev - -TEST_UDEV_VERSION=55 - -udev_55_rules=`cat <&2; exit 1;; - esac -} - -setup_test_input_install_device_node_setup() { - # Set up unit testing environment for the "install_udev" function below. - test_drv_grp="$1" # The expected vboxdrv group - test_drv_mode="$2" # The expected vboxdrv mode - test_inst_dir="$3" # The expected installation directory - test_usb_grp="$4" # The expected USB node group - udev_rule_file=/dev/null - sysfs_usb_devices=test_sysfs_path - EXTERN=extern_test_input_install_device_node_setup - eval 'do_install_udev() { test "$1" = "${test_drv_grp}" \ - -a "$2" = "${test_drv_mode}" \ - -a "$3" = "${test_inst_dir}" \ - -a "$4" = "${test_usb_grp}" \ - -a "$5" = "${INSTALL_NO_UDEV}" \ - || echo "do_install_udev: bad parameters: $@" >&2 ; }' - eval 'do_install_create_usb_node_for_sysfs() { \ - test "$1" = "${sysfs_usb_devices}" \ - -a "$2" = "${test_inst_dir}/VBoxCreateUSBNode.sh" \ - -a "$3" = "${test_usb_grp}" \ - || echo "do_install_create_usb_node_for_sysfs: \ -bad parameters: $@" >&2 ; }' -} - -unset INSTALL_NO_GROUP -unset INSTALL_NO_UDEV -setup_test_input_install_device_node_setup vboxusers 0660 /opt/VirtualBox \ - vboxusb - -command="install_device_node_setup vboxusers 0660 /opt/VirtualBox vboxusb" -err="`${command} 2>&1`" -test -n "${err}" && { - echo "${command} failed." - echo "Error: ${err}" - CERRS="`expr "$CERRS" + 1`" -} - -INSTALL_NO_GROUP=1 -unset INSTALL_NO_UDEV -setup_test_input_install_device_node_setup root 0660 /opt/VirtualBox root - -command="install_device_node_setup vboxusers 0660 /opt/VirtualBox vboxusb" -err="`${command} 2>&1`" -test -n "${err}" && { - echo "${command} failed." - echo "Error: ${err}" - CERRS="`expr "$CERRS" + 1`" -} - -unset INSTALL_NO_GROUP -INSTALL_NO_UDEV=1 -setup_test_input_install_device_node_setup vboxusers 0660 /opt/VirtualBox \ - vboxusb - -command="install_device_node_setup vboxusers 0660 /opt/VirtualBox vboxusb" -err="`${command} 2>&1`" -test -n "${err}" && { - echo "${command} failed." - echo "Error: ${err}" - CERRS="`expr "$CERRS" + 1`" -} - -echo "Done. Error count $CERRS."