Merge tag 'uniphier-v2020.04-2' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[oweals/u-boot.git] / test / fs / fs-test.sh

diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh
index 86308cfe2dbd389ed43d4da8ecf842c37a26fd7d..b87748106c7a3c9b3be6dcf405366aa33e7cd036 100755 (executable)
--- a/test/fs/fs-test.sh
+++ b/test/fs/fs-test.sh
@@ -87,7 +87,7 @@ function check_clean() {
 # Generate sandbox U-Boot - gleaned from /test/dm/test-dm.sh
 function compile_sandbox() {
        unset CROSS_COMPILE
-       NUM_CPUS=$(cat /proc/cpuinfo |grep -c processor)
+       NUM_CPUS=$(nproc)
        make O=sandbox sandbox_config
        make O=sandbox -s -j${NUM_CPUS}
 
@@ -194,7 +194,7 @@ function test_image() {
                ;;
 
                sb)
-               PREFIX="sb "
+               PREFIX="host "
                WRITE="save"
                SUFFIX="fs -"
                ;;
@@ -217,11 +217,11 @@ function test_image() {
 
        # In u-boot commands, <interface> stands for host or hostfs
        # hostfs maps to the host fs.
-       # host maps to the "sb bind" that we do
+       # host maps to the "host bind" that we do
 
        $UBOOT << EOF
 sb=$5
-setenv bind 'if test "\$sb" != sb; then sb bind 0 "$1"; fi'
+setenv bind 'if test "\$sb" != sb; then host bind 0 "$1"; fi'
 run bind
 # Test Case 1 - ls
 ${PREFIX}ls host${SUFFIX} $6
@@ -229,7 +229,7 @@ ${PREFIX}ls host${SUFFIX} $6
 ${PREFIX}ls host${SUFFIX} invalid_d
 #
 # We want ${PREFIX}size host 0:0 $3 for host commands and
-# sb size hostfs - $3 for hostfs commands.
+# host size hostfs - $3 for hostfs commands.
 # 1MB is 0x0010 0000
 # Test Case 2a - size of small file
 ${PREFIX}size host${SUFFIX} ${FPATH}$FILE_SMALL
@@ -575,7 +575,7 @@ TOTAL_PASS=0
 
 # In each loop, for a given file system image, we test both the
 # fs command, like load/size/write, the file system specific command
-# like: ext4load/ext4size/ext4write and the sb load/ls/save commands.
+# like: ext4load/ext4size/ext4write and the host load/ls/save commands.
 for fs in ext4 fat16 fat32; do
 
        echo "Creating $fs image if not already present."
@@ -583,11 +583,11 @@ for fs in ext4 fat16 fat32; do
        MD5_FILE_FS="${MD5_FILE}.${fs}"
        create_image $IMAGE $fs
 
-       # sb commands test
+       # host commands test
        echo "Creating files in $fs image if not already present."
        create_files $IMAGE $MD5_FILE_FS
 
-       # Lets mount the image and test sb hostfs commands
+       # Lets mount the image and test host hostfs commands
        mkdir -p "$MOUNT_DIR"
        case "$fs" in
                fat*)