From c99aa0a21d88204a87a82f91adbd494c8a5827f4 Mon Sep 17 00:00:00 2001 From: arowser Date: Tue, 18 Dec 2018 11:32:52 +0800 Subject: [PATCH] update pytest check --- Makefile | 2 +- configure | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 136d3afd4..22064055d 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ check: $(MAKE) pytest pytest: $(ALL_PROGRAMS) -ifndef PYTEST +ifeq ($(PYTEST),) @echo "py.test is required to run the integration tests, please install using 'pip3 install -r tests/requirements.txt', and rerun 'configure'." exit 1 else diff --git a/configure b/configure index 5b4d6c577..c968d744e 100755 --- a/configure +++ b/configure @@ -62,7 +62,11 @@ usage() add_var() { - echo "Setting $1... $2" + if [ -n "$2" ]; then + echo "Setting $1... $2" + else + echo "$1 not found" + fi echo "$1=$2" >> $CONFIG_VAR_FILE [ -z "$3" ] || echo "#define $1 $2" >> "$3" }