new_variant: update end-to-end test for dedede

Dedede fitimage commits need to include an ME binary, so copy the
reference board's me_rw-${REF}.bin to make an ME binary for the
new board.

BUG=b:184746627
TEST=`new_variant_fulltest.sh waddledee` and
`new_variant_fulltest.sh waddledoo` succeed.

Change-Id: If40f38dcc73077d1850dfb84292b637e43258e41
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2811002
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
diff --git a/contrib/variant/testdata/new_variant_fulltest.sh b/contrib/variant/testdata/new_variant_fulltest.sh
index 9b4416b..9a93cd4 100755
--- a/contrib/variant/testdata/new_variant_fulltest.sh
+++ b/contrib/variant/testdata/new_variant_fulltest.sh
@@ -161,6 +161,7 @@
   if [[ ! -z ${FITIMAGE_OUTPUTS_DIR+x} ]] ; then
     pushd "${FITIMAGE_OUTPUTS_DIR}"
     rm -f "fitimage-${NEW}.bin" "fitimage-${NEW}-versions.txt"
+    rm -f "me_rw-${NEW}.bin"
     # Clean up the extra Volteer fitimage files, too.
     if [[ "${REFERENCE}" == "volteer" || "${REFERENCE}" == "volteer2" ]] ; then
       rm -f "fit-${NEW}.log"
@@ -175,7 +176,7 @@
       rm -f "fit-${NEW}-ro.log" "fit-${NEW}-rw.log"
       popd
       pushd "${FITIMAGE_FILES_DIR}/maps"
-      rm "fitimage-${NEW}.map"
+      rm -f "fitimage-${NEW}.map"
     fi
     popd
   fi
@@ -245,6 +246,10 @@
     # All boards that have fitimages and are not volteer use a fitimage binary.
     cp "${FITIMAGE_FILES_DIR}/fitimage-${FITIMAGE}.bin" "fitimage-${NEW}.bin"
     cp "${FITIMAGE_FILES_DIR}/fitimage-${FITIMAGE}-versions.txt" "fitimage-${NEW}-versions.txt"
+    # Dedede boards also need an me_rw-${VARIANT}.bin
+    if [[ "${REFERENCE}" == "waddledee" || "${REFERENCE}" == "waddledoo" ]] ; then
+      cp "${FITIMAGE_FILES_DIR}/me_rw-${FITIMAGE}.bin" "me_rw-${NEW}.bin"
+    fi
   fi
   popd
 fi