From eb71afdbe388efba26aa04375f57d486b69812d8 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 19 Jul 2016 17:30:03 +0800 Subject: [PATCH] cmake: disable VTA for osdcap.cc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit this silences the warning of: ``` In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:58:0, from /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:20: /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc: In member function ‘virtual void OSDCap_AllowClassMulti_Test::TestBody()’: /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:766:6: note: variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without TEST(OSDCap, AllowClassMulti) { ^ /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/internal/gtest-internal.h:1211:3: note: in definition of macro ‘GTEST_TEST_CLASS_NAME_’ test_case_name##_##test_name##_Test ^ /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:2181:3: note: in expansion of macro ‘GTEST_TEST_’ GTEST_TEST_(test_case_name, test_name, \ ^ /home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:2187:42: note: in expansion of macro ‘GTEST_TEST’ # define TEST(test_case_name, test_name) GTEST_TEST(test_case_name, # test_name) ^ /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:766:1: note: in expansion of macro ‘TEST’ TEST(OSDCap, AllowClassMulti) { ^ ``` see also b668051 Signed-off-by: Kefu Chai --- src/osd/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osd/CMakeLists.txt b/src/osd/CMakeLists.txt index ec1bd3f74f93a..300538671654f 100644 --- a/src/osd/CMakeLists.txt +++ b/src/osd/CMakeLists.txt @@ -23,6 +23,10 @@ set(osd_srcs ECUtil.cc ${CMAKE_SOURCE_DIR}/src/common/TrackedOp.cc ${osdc_osd_srcs}) +if(HAS_VTA) + set_source_files_properties(osdcap.cc + PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments) +endif() add_library(osd STATIC ${osd_srcs} $ $ -- 2.39.5