Introduce crossystem wrapper in SAFT.

runtests.sh

 #!/bin/bash
 # Copyright (c) 2010 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.
 
 # A simple script to run SAFT unit tests and possibly start the SAFT.
 #
 # The only expected optional command line parameter is the name of the file
 # containing the firmware image to test. If the parameter is not provided,
 # SAFT is not started, just the unit tests get to run.
@@ skipping 13 matching lines @@
 
 # This hack has been borrowed from src/scripts/common.sh
 enable_rw_mount() {
   local rootfs="$1"
   local ro_compat_offset=$((0x464 + 3))  # Set 'highest' byte
   printf '\000' |
     sudo dd of="$rootfs" seek=${ro_compat_offset} \
             conv=notrunc count=1 bs=1
 }
 
+target_hosted () {
+    local vers_sig='/proc/version_signature'
+    if [ -f "${vers_sig}" ]; then
+        if egrep -iq 'chrom.*os' "${vers_sig}"; then
+            echo '1'
+            return
+        fi
+    fi
+    echo '0'
+}
+
 on_removable_device() {
     # Check if the code is running off a removable device or not.
     # Print '1' or '0' respectively on the console.
     rootd=$(df "${this_prog}" | grep '^/dev' | awk '{ print $1 }')
     if [ "${rootd}" == '/dev/root' ]; then
         rootd=$(rootdev -s)
     fi
     blockd=$(echo "${rootd}"  | sed 's|.*/\([^/0-9]\+\)[0-9]\+|\1|')
-    removable=$(cat /sys/block/"${blockd}"/removable)
-    echo "${removable}"
+    removable="/sys/block/"${blockd}"/removable"
+    if [ -f "${removable}" ]; then
+        cat "${removable}"
+    else
+        echo '0'
+    fi
 }
 
 move_to_removable_device() {
     # Move ourselves to the removable device and run off it.
 
     # For simplicity, hardcode the removable device to be /dev/sdb
     flash_device="${DEFAULT_FLASH_DEVICE}"
     fname="/sys/block/${flash_device}/removable"
 
     # Confirm SDB exists and is indeed removable.
@@ skipping 39 matching lines @@
 }
 
 configure_gpt_settings() {
     # Let's keep it simple for now, partition 2 is the one to boot.
     cgpt add -i 2 -T 5 -P 9 -S 1 /dev/sda
     cgpt add -i 4 -T 5 -P 5 -S 1 /dev/sda
 }
 
 run_tests() {
     ./test_chromeos_interface.py
+    if [ "$(target_hosted)" == "0" ]; then
+        return
+    fi
     ./test_flashrom_handler.py "${new_firmware}"
     ./test_saft_utility.py
     ./test_kernel_handler.py
     ./test_cgpt_handler.py
     ./test_tpm_handler.py
     ./test_cgpt_state.py
 
     if [ -n "${new_firmware}" ]; then
         configure_gpt_settings
         ./saft_utility.py --ima="${new_firmware}"
@@ skipping 35 matching lines @@
 s/dm="[^"]\+" //' > "${new_cmd_line_file}"
         vbutil_kernel --repack "${other_kern_file}.new" \
             --config "${new_cmd_line_file}" \
             --signprivate recovery_kernel_data_key.vbprivk \
             --oldblob "${other_kern_file}"
         dd if="${other_kern_file}.new" of="${flash_kernel_dev}" bs=4M
     fi
 }
 
 cd $(dirname ${this_prog})
-if [ "$(on_removable_device)" == "0" ]; then
+if [ "$(on_removable_device)" == "0" -a "$(target_hosted)" == "1" ]; then
     check_and_set_saft_environment
     move_to_removable_device
     exit 0
 fi
 
 run_tests