Changeset 43832 in vbox for trunk/src/VBox/Installer/linux/testcase

Timestamp:

Nov 7, 2012 2:37:42 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81910

Message:

Installer/linux: HeadlessXOrg clean-up.

File:

• trunk/src/VBox/Installer/linux/testcase/tstHeadlessXOrg.sh (modified) (12 diffs)

trunk/src/VBox/Installer/linux/testcase/tstHeadlessXOrg.sh

@@ -69 +69 @@
 HEADLESS_X_ORG_CHECK_PREREQUISITES=
 HEADLESS_X_ORG_SERVER_PRE_COMMAND=
-HEADLESS_X_ORG_SERVER_COMMAND="echo \\\${screen} \\\${conf_file} \\\${log_file}"
-HEADLESS_X_ORG_SERVER_LOG_FILE_TEMPLATE="log.\\\${screen}"
+HEADLESS_X_ORG_SERVER_COMMAND="echo"
 EOF
 
@@ -95 +94 @@
 # Create a temporary directory for configuration and logging.
 for i in 0 1 2 3 4 5 6 7 8 9; do
-  TEST_FOLDER="/tmp/${TEST_NAME}${i}"
+  TEST_FOLDER="/tmp/${TEST_NAME} ${i}"  # Space in the name to test quoting.
   mkdir -m 0700 "${TEST_FOLDER}" 2>/dev/null && break
 done
@@ -105 +104 @@
 mkdir -p "${XORG_FOLDER}"
 
-# Simple start-up test.
+###############################################################################
+# Simple start-up test.                                                       #
+###############################################################################
 print_line "simple start-up test"
 create_basic_configuration_file "${TEST_FOLDER}/conf" "${TEST_FOLDER}"
@@ -118 +119 @@
     LOG_FOLDER="${TEST_FOLDER}/log"
     LOG="${LOG_FOLDER}/log"
-    if grep -q "2 ${XORG_FOLDER}/xorg.conf.2 ${LOG_FOLDER}/log.2" "${LOG}" &&
-      grep -q "4 ${XORG_FOLDER}/xorg.conf.4 ${LOG_FOLDER}/log.4" "${LOG}"; then
+    if grep -q "2 ${XORG_FOLDER}/xorg.conf.2 ${LOG_FOLDER}/Xorg.2.log" "${LOG}" &&
+      grep -q "4 ${XORG_FOLDER}/xorg.conf.4 ${LOG_FOLDER}/Xorg.4.log" "${LOG}"; then
       printf "SUCCESS.\n"
     else
@@ -135 +136 @@
 rm "${XORG_FOLDER}"/xorg.conf.*
 
-# No configuration files.
+###############################################################################
+# No configuration files.                                                     #
+###############################################################################
 print_line "no configuration files"
 
@@ -154 +157 @@
 expect_exit "${PID}" 5 test_should_fail
 
-# Bad configuration files.
+###############################################################################
+# Bad configuration files.                                                    #
+###############################################################################
 print_line "bad configuration files"
 touch "${XORG_FOLDER}/xorg.conf.2"
@@ -164 +169 @@
 rm "${XORG_FOLDER}/"xorg.conf.*
 
+###############################################################################
+# Long running server command.                                                #
+###############################################################################
+
 # Set up a configuration file for a long-running command.
 create_basic_configuration_file "${TEST_FOLDER}/conf" "${TEST_FOLDER}"
 cat >> "${TEST_FOLDER}/conf" << EOF
-HEADLESS_X_ORG_SERVER_COMMAND="\"${TEST_NAME_FULL}\" --test-sleep \\\${screen}"
-EOF
-
-# Long running server command.
+HEADLESS_X_ORG_SERVER_COMMAND="\"${TEST_NAME_FULL}\" --test-sleep"
+EOF
+
 print_line "long running server command (sleeps)"
 touch "${XORG_FOLDER}/xorg.conf.1"
@@ -208 +216 @@
 rm "${XORG_FOLDER}/"xorg.conf.*
 
+###############################################################################
+# Pre-requisite test.                                                         #
+###############################################################################
+
 # Set up a configuration file with a pre-requisite.
 create_basic_configuration_file "${TEST_FOLDER}/conf" "${TEST_FOLDER}"
@@ -214 +226 @@
 EOF
 
-# Pre-requisite test.
 print_line "configuration file with pre-requisite (sleeps)"
 touch "${XORG_FOLDER}/xorg.conf.2"
@@ -231 +242 @@
 rm -r "${XORG_FOLDER}"/xorg.conf.* "${TEST_FOLDER}/run"
 
+###############################################################################
+# Pre-command test.                                                           #
+###############################################################################
+
 # Set up our pre-command test configuration file.
 create_basic_configuration_file "${TEST_FOLDER}/conf" "${TEST_FOLDER}"
+
 cat >> "${TEST_FOLDER}/conf" << EOF
+test_pre_command_server_command()
+{
+  cp "${TEST_FOLDER}/run/pre" "${TEST_FOLDER}/run/pre2"
+}
 HEADLESS_X_ORG_SERVER_PRE_COMMAND="touch \"${TEST_FOLDER}/run/pre\""
-HEADLESS_X_ORG_SERVER_COMMAND="cp \"${TEST_FOLDER}/run/pre\" \"${TEST_FOLDER}/run/pre2\""
-EOF
-
-# Pre-command test.
+HEADLESS_X_ORG_SERVER_COMMAND="test_pre_command_server_command"
+EOF
+
 print_line "pre-command test"
 touch "${XORG_FOLDER}/xorg.conf.2"
@@ -266 +285 @@
 rm -f "${XORG_FOLDER}"/xorg.conf.* "${TEST_FOLDER}"/run/pre*
 
+###############################################################################
+# Post-command test.                                                          #
+###############################################################################
+
 # Set up our post-command test configuration file.
 create_basic_configuration_file "${TEST_FOLDER}/conf" "${TEST_FOLDER}"
 cat >> "${TEST_FOLDER}/conf" << EOF
-HEADLESS_X_ORG_SERVER_COMMAND="rm -f \"${TEST_FOLDER}/run/post\""
-HEADLESS_X_ORG_SERVER_POST_COMMAND="touch \"${TEST_FOLDER}/run/post\""
-EOF
-
-# Post-command test.
+test_post_command_post_command()
+{
+  echo "\${1}" > "${TEST_FOLDER}/run/post"
+}
+HEADLESS_X_ORG_SERVER_POST_COMMAND="test_post_command_post_command"
+EOF
+
 print_line "post-command test"
 touch "${XORG_FOLDER}/xorg.conf.2"
@@ -285 +310 @@
     LOG_FOLDER="${TEST_FOLDER}/log"
     LOG="${LOG_FOLDER}/log"
-    if [ -e "${TEST_FOLDER}/run/post" ]; then
+    if grep -q "2 4" "${TEST_FOLDER}/run/post"; then
       printf "SUCCESS.\n"
     else