Fix from review.
This commit is contained in:
parent
f01926b09b
commit
2be4d5e569
4
Makefile
4
Makefile
|
@ -477,7 +477,11 @@ test junittest:
|
||||||
|
|
||||||
check-target-independence:
|
check-target-independence:
|
||||||
$(V1) for test_target in $(VALID_TARGETS); do \
|
$(V1) for test_target in $(VALID_TARGETS); do \
|
||||||
|
<<<<<<< HEAD
|
||||||
FOUND=$$(grep -rP "\W$${test_target}\W?" src/main/ | grep -vP "(\/\/)|(\/\*).*\W$${test_target}\W?" | grep -vP "^src/main/target"); \
|
FOUND=$$(grep -rP "\W$${test_target}\W?" src/main/ | grep -vP "(\/\/)|(\/\*).*\W$${test_target}\W?" | grep -vP "^src/main/target"); \
|
||||||
|
=======
|
||||||
|
FOUND=$$(grep -rP "\W$${test_target}\W" src/main/ | grep -vP "(\/\/)|(\/\*).*\W$${test_target}\W" | grep -vP "^src/main/target"); \
|
||||||
|
>>>>>>> 2a65b67d2... Fix from review.
|
||||||
if [ "$${FOUND}" != "" ]; then \
|
if [ "$${FOUND}" != "" ]; then \
|
||||||
echo "Target dependencies found:"; \
|
echo "Target dependencies found:"; \
|
||||||
echo "$${FOUND}"; \
|
echo "$${FOUND}"; \
|
||||||
|
|
Loading…
Reference in New Issue