Restore msgbox_mask package defaults (#2527)

Updates DR to [a15656a0c](36a6d23). Replaces the AUTOMATED_TESTING set in package builds by PR #2474 with the new DISABLE_ZLIB CMake option added by DynamoRIO/dynamorio#7030. This fixes a regression where msgbox_mask was set to 0 by default in packages, which caused many users to fail to obtain error information and has led to confusion with silent errors. Tested: Built https://github.com/DynamoRIO/drmemory/releases/tag/cronbuild-2.6.20005, unzipped it, and confirmed it pops up a message box by default on the machine where DynamoRIO/dynamorio#7024 is hit. Fixes DynamoRIO/dynamorio#7025
DynamoRIO · Oct 9, 2024 · f62daf1 · f62daf1
1 parent 384f6aa
commit f62daf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dynamorio b/dynamorio
diff --git a/package.cmake b/package.cmake
@@ -1,5 +1,5 @@
 # **********************************************************
-# Copyright (c) 2010-2022 Google, Inc.  All rights reserved.
+# Copyright (c) 2010-2024 Google, Inc.  All rights reserved.
 # Copyright (c) 2009-2010 VMware, Inc.  All rights reserved.
 # **********************************************************
 
@@ -136,7 +136,7 @@ set(base_cache "
   UNIQUE_BUILD_NUMBER:STRING=${arg_ubuild}
   BUILD_TOOL_TESTS:BOOL=OFF
   BUILDING_PACKAGE:BOOL=ON
-  AUTOMATED_TESTING:BOOL=ON
+  DISABLE_ZLIB:BOOL=ON
   ${sub_entry}
   ${arg_cacheappend}
   ${base_cache}
+4 −4		.github/workflows/ci-package.yml
+10 −10		.github/workflows/ci-windows.yml
+4 −4		.github/workflows/ci-x86.yml
+3 −2		CMakeLists.txt
+1 −1		clients/drcachesim/analyzer.cpp
+4 −2		clients/drcachesim/analyzer_multi.cpp
+32 −16		clients/drcachesim/common/options.cpp
+2 −1		clients/drcachesim/common/options.h
+220 −50		clients/drcachesim/scheduler/scheduler.cpp
+51 −8		clients/drcachesim/scheduler/scheduler.h
+2 −2		clients/drcachesim/simulator/caching_device.cpp
+8 −5		clients/drcachesim/simulator/prefetcher.cpp
+4 −1		clients/drcachesim/simulator/prefetcher.h
+25 −14		clients/drcachesim/tests/drcachesim_unit_tests.cpp
+365 −20		clients/drcachesim/tests/scheduler_unit_tests.cpp
+7 −2		make/package.cmake
+1 −0		suite/runsuite_wrapper.pl