Update deterministic build whitelist now that "Windows deterministic" uses separate build dirs.

Also remove no-longer-needed debug logging.

TBR=hans

Bug: 899438
Change-Id: I1759e7e2f6ee8ece3fcdddeeb286754c1cf6b60a
Reviewed-on: https://chromium-review.googlesource.com/c/1348310Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610467}

tools/determinism/compare_build_artifacts.py

@@ -190,12 +190,7 @@ def compare_files(first_filepath, second_filepath):
     with open(second_filepath, 'rb') as f:
       lhs_cwd = lhs['relative_cwd'].replace('\\', '\\\\')
       rhs_cwd = rhs['relative_cwd'].replace('\\', '\\\\')
-      json_contents = f.read()
-      print >>sys.stderr, 'raw contents', second_filepath, ':', json_contents
-      json_contents = json_contents.replace(rhs_cwd, lhs_cwd)
-      print >>sys.stderr, 'transformed', rhs_cwd, lhs_cwd, json_contents
-      rhs = json.loads(json_contents)
-      print >>sys.stderr, 'objects', lhs, rhs
+      rhs = json.loads(f.read().replace(rhs_cwd, lhs_cwd))
     diff = diff_dict(lhs, rhs)
     if diff:
       return '\n' + '\n'.join('  ' + line for line in diff.splitlines())

tools/determinism/deterministic_build_whitelist.pyl

@@ -198,5 +198,49 @@
     # them probably should use build_utils.ZipDir() instead.
     'mini_installer_tests.zip',
     'policy_templates.zip',
+
+    # These are no longer deterministic now that two different build dirs
+    # are being used:
+    'nacl_test_data\\extension_vcache_test\\glibc\\extension_validation_cache_glibc_x86_32.nexe',
+    'nacl_test_data\\extension_vcache_test\\glibc\\extension_validation_cache_glibc_x86_64.nexe',
+    'nacl_test_data\\extension_vcache_test\\glibc\\extension_validation_cache_libs\\lib32\\libppapi_cpp_lib.dll',
+    'nacl_test_data\\extension_vcache_test\\glibc\\extension_validation_cache_libs\\lib64\\libppapi_cpp_lib.dll',
+    'nacl_test_data\\glibc\\irt_exception_test_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\irt_exception_test_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\pm_exit_status_test_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\pm_exit_status_test_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\pm_exit_status_test_libs\\lib32\\libppapi_cpp_lib.dll',
+    'nacl_test_data\\glibc\\pm_exit_status_test_libs\\lib64\\libppapi_cpp_lib.dll',
+    'nacl_test_data\\glibc\\ppapi_crash_in_callback_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_in_callback_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_off_main_thread_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_off_main_thread_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_ppapi_off_main_thread_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_ppapi_off_main_thread_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_via_check_failure_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_via_check_failure_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_via_exit_call_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_crash_via_exit_call_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_ppb_core_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_ppb_core_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_ppb_instance_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_ppb_instance_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_ppp_instance_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_ppp_instance_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\ppapi_progress_events_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\ppapi_progress_events_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\simple_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\simple_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\simple_libs\\lib32\\libppapi_cpp_lib.dll',
+    'nacl_test_data\\glibc\\simple_libs\\lib64\\libppapi_cpp_lib.dll',
+    'nacl_test_data\\glibc\\sysconf_nprocessors_onln_test_glibc_x86_32.nexe',
+    'nacl_test_data\\glibc\\sysconf_nprocessors_onln_test_glibc_x86_64.nexe',
+    'nacl_test_data\\glibc\\sysconf_nprocessors_onln_test_libs\\lib32\\libppapi_cpp_lib.dll',
+    'nacl_test_data\\glibc\\sysconf_nprocessors_onln_test_libs\\lib64\\libppapi_cpp_lib.dll',
+    'ppapi_nacl_tests_glibc_x86_32.nexe',
+    'ppapi_nacl_tests_glibc_x86_64.nexe',
+    'ppapi_nacl_tests_libs\\lib32\\glibc_x86\\libppapi_cpp_lib.dll',
+    'ppapi_nacl_tests_libs\\lib64\\glibc_x64\\libppapi_cpp_lib.dll',
+    'resources\\inspector\\browser_console\\browser_console_module.js',
   ],
 }