cbuild2.sh: --set <foo> is now shifted behind --target when both commands are present on command line.

This is because the validity of <foo> is determined by --target.

Change-Id: I3c3f53448caa38805b75897176a3b6573bda0125

1 files changed, 34 insertions, 0 deletions

diff --git a/test.sh b/test.sh
index fdfd3b81..36424a5e 100755
--- a/test.sh
+++ b/test.sh
@@ -410,6 +410,40 @@ test_pass "${cb_commands}" "${match}"
 
 tmpdir=`dirname ${local_snapshots}`
 
+target="aarch64-none-elf"
+cb_commands="--target ${target} --set libc=glibc"
+match="crosscheck_clibrary_target"
+test_failure "${cb_commands}" "${match}"
+
+target="aarch64-none-elf"
+cb_commands="--set libc=glibc --target ${target}"
+match="crosscheck_clibrary_target"
+test_failure "${cb_commands}" "${match}"
+
+target="aarch64-none-elf"
+cb_commands="--set libc=newlibv --target ${target}"
+match=''
+test_failure "${cb_commands}" "${match}"
+
+target="aarch64-none-elf"
+cb_commands="--target ${target} --set libc=newlib"
+match=''
+test_pass "${cb_commands}" "${match}"
+
+# The same as previous but with other commands mixed in.
+target="aarch64-none-elf"
+cb_commands="--set libc=glibc --dry-run --build all --target ${target}"
+match="crosscheck_clibrary_target"
+test_failure "${cb_commands}" "${match}"
+
+# The same as previous but with other commands mixed in.
+target="arm-none-linux-gnueabihf"
+cb_commands="--set libc=glibc --dry-run --build all --target ${target}"
+match=''
+test_pass "${cb_commands}" "${match}"
+
+
+
 # If the tests pass successfully clean up /tmp/<tmpdir> but only if the
 # directory name is conformant.  We don't want to accidentally remove /tmp.
 if test x"${tmpdir}" = x"/tmp"; then