Fix test status after change to keepclassmembers and archive issue.

Change-Id: Iee74ba8d42297cced6ece6d6d079e065b6290b2b
diff --git a/tools/test.py b/tools/test.py
index e05ad55..015e53e 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -253,7 +253,7 @@
   if options.only_jctf:
     # Note: not setting -Pruntimes will run with all available runtimes.
     return_code = gradle.RunGradle(gradle_args, throw_on_failure=False)
-    return archive_and_return(return_code)
+    return archive_and_return(return_code, options)
 
   # Now run tests on selected runtime(s).
   vms_to_test = [options.dex_vm] if options.dex_vm != "all" else ALL_ART_VMS
@@ -278,12 +278,12 @@
                                            'gs://r8-test-results/golden-files/' + archive)
 
     if return_code != 0:
-      return archive_and_return(return_code)
+      return archive_and_return(return_code, options)
 
   return 0
 
 
-def archive_and_return(return_code):
+def archive_and_return(return_code, options):
   if return_code != 0:
     if options.archive_failures and os.name != 'nt':
       archive_failures()