Fixed tests target in Makefile along run_tests script

Makefile

@@ -12,7 +12,7 @@ help_srv:
 	@echo "┌──────────────────────────────────────────────────────────────────────────────┐"
 	@echo "│ MANAGE nexus certificates                                                    │"
 	@echo "└──────────────────────────────────────────────────────────────────────────────┘"
-	@echo "  certs               create certificates in $(CERTS_DIR)" directory
+	@echo "  certs               create certificates in $(CERTS_DIR) directory"
 	@echo "  clean_certs         delete certificates"
 	@echo ""
 	@echo "┌──────────────────────────────────────────────────────────────────────────────┐"
@@ -58,7 +58,7 @@ __check_defined = \
     $(if $(value $1),, \
       $(error Environment variable $1$(if $2, ($2)) must be set))
 
-check_prefix:
+check_prefix_var:
 	$(call check_defined, PREFIX)
 
 #-------------------------------------------------------------------------
@@ -132,7 +132,7 @@ copy_binaries_srv:
 	@cp tools/vm_run $(SERVER_BASEDIR)/bin
 	@echo "OK"
 
-update_srv: prepare_update_srv check_prefix copy_binaries_srv
+update_srv: prepare_update_srv check_prefix_var copy_binaries_srv
 	@echo "Successfully updated nexus-server in $(SERVER_BASEDIR)"
 
 prepare_update_srv:
@@ -141,13 +141,13 @@ prepare_update_srv:
 #-------------------------------------------------------------------------
 # Server targets for dev environment
 
-install_dev_srv: prepare_install_dev_srv check_prefix check_cert src/server/nexus-server tools/genpwd/genpwd create_files_srv copy_config_srv copy_certs copy_binaries_srv
+install_dev_srv: prepare_install_dev_srv check_prefix_var check_cert src/server/nexus-server tools/genpwd/genpwd create_files_srv copy_config_srv copy_certs copy_binaries_srv
 	@echo "Successfully deployed nexus-server into $(SERVER_BASEDIR)"
 
 prepare_install_dev_srv:
 	@echo "[Deploying nexus-server for a development environment in $(SERVER_BASEDIR)]"
 
-uninstall_dev_srv: check_prefix prepare_uninstall_dev_srv remove_files_srv
+uninstall_dev_srv: check_prefix_var prepare_uninstall_dev_srv remove_files_srv
 	@echo "Successfully uninstalled development nexus-server"
 
 prepare_uninstall_dev_srv:
@@ -156,13 +156,13 @@ prepare_uninstall_dev_srv:
 #-------------------------------------------------------------------------
 # Server targets for prod environment
 
-install_prod_srv: prepare_install_prod_srv check_prefix check_cert src/server/nexus-server tools/genpwd/genpwd create_user create_files_srv copy_config_srv copy_certs copy_binaries_srv set_permissions_srv install_service_srv
+install_prod_srv: prepare_install_prod_srv check_prefix_var check_cert src/server/nexus-server tools/genpwd/genpwd create_user create_files_srv copy_config_srv copy_certs copy_binaries_srv set_permissions_srv install_service_srv
 	@echo "Successfully deployed nexus-server into $(SERVER_BASEDIR)"
 
 prepare_install_prod_srv:
 	@echo "[Deploying nexus-server for a production environment in $(SERVER_BASEDIR)]"
 
-uninstall_prod_srv: check_prefix prepare_uninstall_prod_srv remove_service_srv remove_files_srv del_user
+uninstall_prod_srv: check_prefix_var prepare_uninstall_prod_srv remove_service_srv remove_files_srv del_user
 	@echo "Successfully uninstalled production nexus-server"
 
 prepare_uninstall_prod_srv:
@@ -232,7 +232,7 @@ ARCHES_CLIENT=amd64 arm64 386
 RESOURCES_DIR_CLIENT=src/client/defaults/resources
 DEFAULT_PORT_SERVER=1077
 
-check_bin:
+check_bin_var:
 	$(call check_defined, BIN)
 
 help_client:
@@ -245,7 +245,7 @@ help_client:
 	@echo "  build_nexus-exam  build nexus-exam"
 	@echo "  xbuild_client     cross-build $(BIN) for Linux, Windows, Darwin (OSX)"
 	@echo "                    require the BIN variable to be set; it specifies which"
-	                           binary to cross-build: nexush or nexus-cli"
+	@echo "                    binary to cross-build: nexush or nexus-cli"
 	@echo "  clean_client      delete $(BUILD_DIR_CLIENT) directory (generated binaries)"
 	@echo ""
 	@echo "┌──────────────────────────────────────────────────────────────────────────────┐"
@@ -266,7 +266,7 @@ $(RESOURCES_DIR_CLIENT)/server: $(RESOURCES_DIR_CLIENT) config/certs/nexus-serve
 
 copy_resources_client: $(RESOURCES_DIR_CLIENT)/$(CA_CERT_FILE) $(RESOURCES_DIR_CLIENT)/server
 
-xbuild_client: check_bin copy_resources_client $(SRC_CLIENT)/nexush $(SRC_CLIENT)/nexus-cli
+xbuild_client: check_bin_var copy_resources_client $(SRC_CLIENT)/nexush $(SRC_CLIENT)/nexus-cli
 	@echo "[Cross-building $(BIN) into $(BUILD_DIR_CLIENT) directory]"
 	@for os in $(OSES_CLIENT); do \
         for arch in $(ARCHES_CLIENT); do \
@@ -304,8 +304,11 @@ build_nexus-exam: copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-
 clean_client:
 	@/bin/rm -rf $(BUILD_DIR_CLIENT) $(RESOURCES_DIR_CLIENT)
 
-tests: tests/run_tests build_nexus-cli $(BUILD_DIR_CLIENT)/nexus-cli
-	./$< $(BUILD_DIR_CLIENT)/nexus-cli
+check_login_var:
+	$(call check_defined, LOGIN)
+
+tests: check_login_var tests/run_tests build_nexus-cli $(BUILD_DIR_CLIENT)/nexus-cli
+	@cd tests && ./run_tests $(BUILD_ABS_CLIENT)/nexus-cli $(LOGIN)
 
 .PHONY: clean_client tests
 
@@ -321,7 +324,7 @@ tests: tests/run_tests build_nexus-cli $(BUILD_DIR_CLIENT)/nexus-cli
 # 	$(if $(ARCH),,$(error Please define the ARCH environment variable: supported values are amd64, arm64, 386))
 # 	@mkdir -p $(BUILD_DIR_CLIENT)/$(ARCH)/$(OS)
 
-# build_client: check_bin build_dir_client_arch_os copy_resources_client
+# build_client: check_bin_var build_dir_client_arch_os copy_resources_client
 # 	@echo "[Building client into $(BUILD_DIR_CLIENT)] directory"
 # 	@echo "[Building for $(OS) $(ARCH)]" ;\
 # 	if [ $(OS) = "linux" ]; then \

tests/run_tests

@@ -8,6 +8,7 @@ if [ $# -ne 2 ]; then
 fi
 
 nexus_cli="$1"
+email=$2
 
 vm_tpl_name="exam 328a2d0eff08"
 vm_base_name="live $vm_tpl_name"
@@ -65,14 +66,6 @@ check_valid_uuid () {
     fi
 }
 
-argc=$#
-app=`basename $0`
-if [ $argc -ne 1 ]; then
-    echo "USAGE: $app email"
-    exit 1
-fi
-email=$2
-
 echo "Log in..."
 export NEXUS_TOKEN=`$nexus_cli login $email`
 if [ -z $NEXUS_TOKEN ]; then