gitlab-ci: Add missing TEST_ENV variables

This should fix #16985.

.gitlab-ci.yml

@@ -213,6 +213,8 @@ validate-x86_64-linux-deb9-hadrian:
   extends: .validate-hadrian
   stage: build
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
+  variables:
+    TEST_ENV: "x86_64-linux-deb9-hadrian"
   before_script:
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
@@ -341,7 +343,7 @@ validate-x86_64-darwin:
     ac_cv_func_clock_gettime: "no"
     LANG: "en_US.UTF-8"
     CONFIGURE_ARGS: --with-intree-gmp
-    TEST_ENV: "x86_64-darwin"
+    TEST_ENV: "x86_64-darwin-hadrian"
   before_script:
     - git clean -xdf && git submodule foreach git clean -xdf
     - git submodule sync --recursive
@@ -730,6 +732,7 @@ validate-x86_64-windows-hadrian:
   extends: .build-windows-hadrian
   variables:
     MSYSTEM: MINGW64
+    TEST_ENV: "x86_64-windows-hadrian"
   cache:
     key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION"
 
@@ -737,6 +740,7 @@ nightly-i386-windows-hadrian:
   extends: .build-windows-hadrian
   variables:
     MSYSTEM: MINGW32
+    TEST_ENV: "x86_64-windows-hadrian"
   only:
     variables:
       - $NIGHTLY
@@ -778,6 +782,7 @@ validate-x86_64-windows:
   variables:
     MSYSTEM: MINGW64
     CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32"
+    TEST_ENV: "x86_64-windows"
   cache:
     key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION"
 
@@ -801,6 +806,7 @@ release-x86_64-windows:
     MSYSTEM: MINGW64
     BUILD_FLAVOUR: "perf"
     CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32"
+    TEST_ENV: "x86_64-windows"
   only:
     - tags
 
@@ -814,6 +820,7 @@ release-i386-windows:
     CONFIGURE_ARGS: "--target=i386-unknown-mingw32"
     # Due to #15934
     BUILD_PROF_LIBS: "NO"
+    TEST_ENV: "i386-windows"
   cache:
     key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION"
 
@@ -827,6 +834,7 @@ nightly-i386-windows:
     CONFIGURE_ARGS: "--target=i386-unknown-mingw32"
     # Due to #15934
     BUILD_PROF_LIBS: "NO"
+    TEST_ENV: "i386-windows"
   cache:
     key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION"