From d4b9a40c6f75ad0e7a03dccebb492876d866acb1 Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Thu, 1 Dec 2022 00:16:16 -0500 Subject: [PATCH] Fix VS2019 warnings in drcachesim (#2474) Updates DR to 1f40176ae to fix VS2019 warnings. Sets AUTOMATED_TESTING to enable settings in the DR build. Issue: DynamoRIO/dynamorio#5767 --- dynamorio | 2 +- package.cmake | 3 ++- tests/runsuite.cmake | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dynamorio b/dynamorio index 5d54b5e68..1f40176ae 160000 --- a/dynamorio +++ b/dynamorio @@ -1 +1 @@ -Subproject commit 5d54b5e681d9c12d6ef00b5fc4124812aa420753 +Subproject commit 1f40176ae98823b0db666956c3df5d4b8f32743a diff --git a/package.cmake b/package.cmake index 20244080c..6ddc57699 100644 --- a/package.cmake +++ b/package.cmake @@ -1,5 +1,5 @@ # ********************************************************** -# Copyright (c) 2010-2021 Google, Inc. All rights reserved. +# Copyright (c) 2010-2022 Google, Inc. All rights reserved. # Copyright (c) 2009-2010 VMware, Inc. All rights reserved. # ********************************************************** @@ -136,6 +136,7 @@ set(base_cache " UNIQUE_BUILD_NUMBER:STRING=${arg_ubuild} BUILD_TOOL_TESTS:BOOL=OFF BUILDING_PACKAGE:BOOL=ON + AUTOMATED_TESTING:BOOL=ON ${sub_entry} ${arg_cacheappend} ${base_cache} diff --git a/tests/runsuite.cmake b/tests/runsuite.cmake index be3d84470..737d14bb8 100644 --- a/tests/runsuite.cmake +++ b/tests/runsuite.cmake @@ -1,5 +1,5 @@ # ********************************************************** -# Copyright (c) 2010-2020 Google, Inc. All rights reserved. +# Copyright (c) 2010-2022 Google, Inc. All rights reserved. # Copyright (c) 2009-2010 VMware, Inc. All rights reserved. # ********************************************************** @@ -213,7 +213,8 @@ endforeach () # i#1099: avoid absolute path complaint on package build step -set(base_cache "BUILDING_PACKAGE:BOOL=ON") +set(base_cache "BUILDING_PACKAGE:BOOL=ON + AUTOMATED_TESTING:BOOL=ON") if (arg_travis AND WIN32) # XXX i#1938: AppVeyor's MinGW g++ crashes for as-yet-unknown reasons.