update_references.sh no longer works for subdirectory

[nikomatsakis]

The new update-references.sh script doesn't compute subdirectories correctly, I fear:

> ./update-references.sh ../../../build/x86_64-unknown-linux-gnu/test/ui/ single-use-lifetime/*rs
updating ./fn-types.stderr
updating ./one-use-in-fn-argument-in-band.stderr
updating ./one-use-in-fn-argument.stderr
updating ./one-use-in-inherent-impl-header.stderr
updating ./one-use-in-inherent-method-argument.stderr
updating ./one-use-in-inherent-method-return.stderr
updating ./one-use-in-trait-method-argument.stderr
updating ./two-uses-in-inherent-method-argument-and-return.stderr
updating ./zero-uses-in-fn.stderr
updating ./zero-uses-in-impl.stderr

Those files should have been placed in ./single-use-lifetime/xxx.stderr. Looking more closely at the bash script, the reason is fairly clear.

cc @ehuss

[nikomatsakis]

This patch seems to work for me, though I think it may fail if you run update-references from the wrong directory .. maybe?

1 file changed, 4 insertions(+), 3 deletions(-)
src/test/ui/update-references.sh | 7 ++++---

modified   src/test/ui/update-references.sh
@@ -36,10 +36,11 @@ shopt -s nullglob
 while [[ "$1" != "" ]]; do
     for EXT in "stderr" "stdout"; do
         for OUT_NAME in $BUILD_DIR/${1%.rs}.*$EXT; do
+            OUT_DIR=`dirname "$1"`
             OUT_BASE=`basename "$OUT_NAME"`
-            if ! (diff $OUT_NAME $MYDIR/$OUT_BASE >& /dev/null); then
-                echo updating $MYDIR/$OUT_BASE
-                cp $OUT_NAME $MYDIR
+            if ! (diff $OUT_NAME $MYDIR/$OUT_DIR/$OUT_BASE >& /dev/null); then
+                echo updating $MYDIR/$OUT_DIR/$OUT_BASE
+                cp $OUT_NAME $MYDIR/$OUT_DIR
             fi
         done
     done

[ehuss]

Yes, apologies! I'll try to post a fix asap.