Run tests after artifact collection

Since for every job there are failing tests, if we try to upload artifacts
after tests, we won't get any. As a temporary measure I suggest uploading
artifacts before running tests. Once tests are fixed, we should peform
artifact uploading after tests again.

.appveyor.sh

@@ -31,10 +31,10 @@ EOF
         ;;
 
     "test")
-        make test THREADS=$THREADS
         make binary-dist
         curl https://ghc-artifacts.s3.amazonaws.com/tools/ghc-artifact-collector-x86_64-windows --output ghc-artifact-collector
         ./ghc-artifact-collector *.tar.xz
+        make test THREADS=$THREADS
         ;;
 
     *)

.circleci/config.yml

@@ -96,9 +96,9 @@ jobs:
       - *boot
       - *configure_unix
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-x86_64-freebsd":
     resource_class: xlarge
@@ -115,9 +115,9 @@ jobs:
       - *boot
       - *configure_bsd
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-x86_64-darwin":
     macos:
@@ -136,9 +136,9 @@ jobs:
       - *boot
       - *configure_unix
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-hadrian-x86_64-linux":
     resource_class: xlarge
@@ -224,9 +224,9 @@ jobs:
       - *boot
       - *configure_unix_32
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
   "validate-x86_64-fedora":
     resource_class: xlarge
@@ -242,9 +242,9 @@ jobs:
       - *boot
       - *configure_unix
       - *make
-      - *test
       - *bindist
       - *storeartifacts
+      - *test
 
 workflows:
   version: 2