The --rcu-kvm argument was intended to allow the scripts to live in an alternate location. Unfortunately, this prevents the kvm.sh script from using common functions until after it finished parsing arguments, because it doesn't know where to find them until then. However, "cp -a" and "ln -s" work pretty well, so lack of an --rcu-kvm argument can be easily worked around. This commit therefore removes this argument.
Showing the changes to tools/testing (1 of 1 file). Show all
Unified · Split
| @@ -46,7 +46,6 @@ usage () { · 45 unmodified lines | |||
| 46 | echo " --duration minutes" | 46 | echo " --duration minutes" |
| 47 | echo " --kversion vN.NN" | 47 | echo " --kversion vN.NN" |
| 48 | echo " --qemu-cmd qemu-system-..." | 48 | echo " --qemu-cmd qemu-system-..." |
| 49 | echo " --rcu-kvm absolute-pathname" | ||
| 50 | echo " --results absolute-pathname" | 49 | echo " --results absolute-pathname" |
| 51 | echo " --relbuilddir relative-pathname" | 50 | echo " --relbuilddir relative-pathname" |
| 52 | exit 1 | 51 | exit 1 |
| @@ -107,19 +106,6 @@ do · 54 unmodified lines | |||
| 107 | RCU_QEMU_CMD="$2"; export RCU_QEMU_CMD | 106 | RCU_QEMU_CMD="$2"; export RCU_QEMU_CMD |
| 108 | shift | 107 | shift |
| 109 | ;; | 108 | ;; |
| 110 | --rcu-kvm) | ||
| 111 | checkarg --rcu-kvm "(absolute pathname)" "$#" "$2" '^/' error | ||
| 112 | KVM=$2; export KVM | ||
| 113 | if -z "$gotbuilddir" | ||
| 114 | then | ||
| 115 | builddir=${KVM}/b1 | ||
| 116 | fi | ||
| 117 | if -n "$gotrelbuilddir" | ||
| 118 | then | ||
| 119 | builddir=${KVM}/${relbuilddir} | ||
| 120 | fi | ||
| 121 | shift | ||
| 122 | ;; | ||
| 123 | --relbuilddir) | 109 | --relbuilddir) |
| 124 | checkarg --relbuilddir "(relative pathname)" "$#" "$2" '^[^/]*$' '^--' | 110 | checkarg --relbuilddir "(relative pathname)" "$#" "$2" '^[^/]*$' '^--' |
| 125 | relbuilddir=$2 | 111 | relbuilddir=$2 |
| @@ -133,6 +119,7 @@ do · 7 unmodified lines | |||
| 133 | shift | 119 | shift |
| 134 | ;; | 120 | ;; |
| 135 | *) | 121 | *) |
| 122 | echo Unknown argument $1 | ||
| 136 | usage | 123 | usage |
| 137 | ;; | 124 | ;; |
| 138 | esac | 125 | esac |