From f42e4e5ffda39d4713e50244fe3677d3fcfd17b0 Mon Sep 17 00:00:00 2001 From: Adam Vartanian Date: Wed, 10 Apr 2019 11:06:57 +0100 Subject: Ignore comments in changelog check Test: manual test with file with comments Change-Id: Ib7000c1969b9a4d9725cdbd3fcca12ae956cde76 --- scripts/repackage-common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/repackage-common.sh b/scripts/repackage-common.sh index 5142959..9753f24 100644 --- a/scripts/repackage-common.sh +++ b/scripts/repackage-common.sh @@ -204,19 +204,19 @@ function checkChangeLog { if [[ -f "${DEFAULT_CONSTRUCTORS_FILE}" ]]; then # Check to ensure that all the requested default constructors were added. - checkChangeLog <(sort -u "${DEFAULT_CONSTRUCTORS_FILE}") "AddDefaultConstructor" \ + checkChangeLog <(sort -u "${DEFAULT_CONSTRUCTORS_FILE}" | grep -v '^#') "AddDefaultConstructor" \ "Default constructors were not added at the following locations from ${DEFAULT_CONSTRUCTORS_FILE}:" fi if [[ -f "${CORE_PLATFORM_API_FILE}" ]]; then # Check to ensure that all the requested annotations were added. - checkChangeLog <(sort -u "${CORE_PLATFORM_API_FILE}") "@libcore.api.CorePlatformApi" \ + checkChangeLog <(sort -u "${CORE_PLATFORM_API_FILE}" | grep -v '^#') "@libcore.api.CorePlatformApi" \ "CorePlatformApi annotations were not added at the following locations from ${CORE_PLATFORM_API_FILE}:" fi if [[ -f "${INTRA_CORE_API_FILE}" ]]; then # Check to ensure that all the requested annotations were added. - checkChangeLog <(sort -u "${INTRA_CORE_API_FILE}") "@libcore.api.IntraCoreApi" \ + checkChangeLog <(sort -u "${INTRA_CORE_API_FILE}" | grep -v '^#') "@libcore.api.IntraCoreApi" \ "IntraCoreApi annotations were not added at the following locations from ${INTRA_CORE_API_FILE}:" fi -- cgit v1.2.3