Skip to content

Commit

Permalink
Makefile: quick fix in sed pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
asherikov committed Dec 20, 2024
1 parent e2b9e8b commit bc223d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export OS_DISTRO_BUILD?=$(shell lsb_release -cs)

# default package to build can be specified in source directory or via command line,
# when not provided usually all packages in the workspace are processed
export PKG?=$(shell (cat "${WORKSPACE_SRC}/.ccws/package" 2> /dev/null | sed -e 's/[[:space:]]*\#.*//' -e '/^[[:space:]]*$/d' | paste -d ' ' -s) || echo "")
export PKG?=$(shell (cat "${WORKSPACE_SRC}/.ccws/package" 2> /dev/null | sed -e 's/[[:space:]]*\#.*//' -e '/^[[:space:]]*$$/d' | paste -d ' ' -s) || echo "")
export PKG_ID=$(shell echo "${PKG}" | md5sum | cut -f 1 -d ' ')


Expand Down
6 changes: 3 additions & 3 deletions ccws/make/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TEST_PKG_LIST=${WORKSPACE_DIR}/build/${BUILD_PROFILE}/ccws.tests.packages
TEST_PKG_LIST_EXCEPT=${WORKSPACE_DIR}/build/${BUILD_PROFILE}/ccws.tests.exceptions.packages

wslist_test:
${MAKE_QUIET} wslist | sort > "${TEST_PKG_LIST}"
(cat "${WORKSPACE_SRC}/.ccws/ccws.tests.exceptions.packages" 2> /dev/null | sed -e 's/[[:space:]]*#.*//' -e '/^[[:space:]]*$/d' || true) | sort > "${TEST_PKG_LIST_EXCEPT}"
comm -23 "${TEST_PKG_LIST}" "${TEST_PKG_LIST_EXCEPT}"
@${MAKE_QUIET} wslist | sort > "${TEST_PKG_LIST}"
@(cat "${WORKSPACE_SRC}/.ccws/ccws.tests.exceptions.packages" 2> /dev/null | sed -e 's/[[:space:]]*#.*//' -e '/^[[:space:]]*$$/d' || true) | sort > "${TEST_PKG_LIST_EXCEPT}"
@comm -23 "${TEST_PKG_LIST}" "${TEST_PKG_LIST_EXCEPT}"

# generic test target, it is recommended to use more specific targets below
wstest_generic:
Expand Down

0 comments on commit bc223d7

Please sign in to comment.