From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754106AbdGUT0F (ORCPT ); Fri, 21 Jul 2017 15:26:05 -0400 Received: from mga14.intel.com ([192.55.52.115]:65133 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752780AbdGUT0E (ORCPT ); Fri, 21 Jul 2017 15:26:04 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,391,1496127600"; d="scan'208";a="995693124" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , sukadev@linux.vnet.ibm.com Subject: [PATCH] perf, tools: Make build fail on JSON parse error Date: Fri, 21 Jul 2017 12:25:57 -0700 Message-Id: <20170721192557.4371-1-andi@firstfloor.org> X-Mailer: git-send-email 2.9.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Today, when a JSON file fails parsing the build continues, but there are no json files built in, which is difficult to debug later. Make the build stop on a parse error instead. Cc: sukadev@linux.vnet.ibm.com Signed-off-by: Andi Kleen --- tools/perf/pmu-events/jevents.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 70cbd5bc4819..58b42508c333 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -890,6 +890,9 @@ int main(int argc, char *argv[]) if (rc && verbose) { pr_info("%s: Error walking file tree %s\n", prog, ldirname); goto empty_map; + } else if (rc < 0) { + /* Make build fail */ + return 1; } else if (rc) { goto empty_map; } @@ -904,7 +907,8 @@ int main(int argc, char *argv[]) if (process_mapfile(eventsfp, mapfile)) { pr_info("%s: Error processing mapfile %s\n", prog, mapfile); - goto empty_map; + /* Make build fail */ + return 1; } return 0; -- 2.9.4