From fa2b25a24f1e9f2b846e7cf5e27fef0ca2679647 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 2 Dec 2015 10:08:22 -0500 Subject: [PATCH 10/10] Fix g++.dg/warn/Wconversion-real-integer2.C MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This testcase's output is changed by the patchkit from printing at the "=": BEFORE: g++.dg/warn/Wconversion-real-integer2.C: In function 'void h()': g++.dg/warn/Wconversion-real-integer2.C:32:12: warning: conversion to 'float' alters 'int' constant value [-Wfloat-conversion] vfloat = INT_MAX; // { dg-warning "conversion to .float. alters .int. constant value" } ^ to showing the token of interest and its macro expansion: AFTER: g++.dg/warn/Wconversion-real-integer2.C: In function ‘void h()’: g++.dg/warn/Wconversion-real-integer2.C:26:17: warning: conversion to ‘float’ alters ‘int’ constant value [-Wfloat-conversion] #define INT_MAX __INT_MAX__ ^ g++.dg/warn/Wconversion-real-integer2.C:32:14: note: in expansion of macro ‘INT_MAX’ vfloat = INT_MAX; // { dg-warning "conversion to .float. alters .int. constant value" } ^~~~~~~ This is an improvement, so this patch updates the test case accordingly. gcc/testsuite/ChangeLog: * g++.dg/warn/Wconversion-real-integer2.C: Update location of dg-warning; add a dg-message. --- gcc/testsuite/g++.dg/warn/Wconversion-real-integer2.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/g++.dg/warn/Wconversion-real-integer2.C b/gcc/testsuite/g++.dg/warn/Wconversion-real-integer2.C index 0494588..7e39d5f 100644 --- a/gcc/testsuite/g++.dg/warn/Wconversion-real-integer2.C +++ b/gcc/testsuite/g++.dg/warn/Wconversion-real-integer2.C @@ -23,11 +23,11 @@ // // That is more useful. -#define INT_MAX __INT_MAX__ +#define INT_MAX __INT_MAX__ // { dg-warning "17: conversion to .float. alters .int. constant value" } float vfloat; void h (void) { - vfloat = INT_MAX; // { dg-warning "conversion to .float. alters .int. constant value" } + vfloat = INT_MAX; // { dg-message "14: in expansion of macro .INT_MAX." } } -- 1.8.5.3