CI: Correct the tests and run them on GitHub Actions

Author: solardiz

Makefile

@@ -307,14 +307,13 @@ remove_lib_wrapped:
 remove_locales_wrapped:
 	for f in $(LANGUAGES); do $(RM) $(DESTDIR)$(LOCALEDIR)/$$f/LC_MESSAGES/$(PACKAGE).mo; done
 
-check:
+check: default
 	@echo "Running tests..."
-	# Set LD_LIBRARY_PATH to include the current directory
-	@export LDFLAGS="-Wl,-rpath,$(CURDIR)"; \
-	export LD_LIBRARY_PATH=$(CURDIR):$$LD_LIBRARY_PATH; \
+	@export LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH; \
+		set -e; \
 		for test in tests/*.sh; do \
 			echo "Executing $$test..."; \
-			bash $$test || echo "$$test failed"; \
+			$$test; \
 		done
 	@echo "Tests completed!"
 

ci/run-build-and-tests.sh

@@ -36,6 +36,8 @@ make -k $j \
 	CFLAGS_lib='-Wall -W -Werror -fPIC' \
 	all locales
 
+make check
+
 if git status --porcelain |grep ^.; then
 	echo >&2 'git status reported uncleanness'
 	exit 1

tests/test-pwqcheck-basic.sh

@@ -4,6 +4,10 @@
 #
 #
 
+set -o pipefail
+
+PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+
 if [ -t 1 ]; then
 # Colors for better visibility
 	GREEN='\033[0;32m'
@@ -21,26 +25,25 @@ test_basic_password() {
 	local expected="$2"
 	local description="$3"
 
-	PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+	printf "%-40s" "$description"
 
-	echo -n "Testing $description: "
 	result=$(echo "$password" | "$PWQCHECK_BIN" -1 2>&1)
 	exit_code=$?
 
 	if [ "$expected" = "pass" -a "$exit_code" -eq 0 ] || \
 	   [ "$expected" = "fail" -a "$exit_code" -ne 0 ]; then
 		echo -e "${GREEN}PASS${NC}"
-		echo "  Password tested: '$password'"
-		echo "  Result: $result"
-		echo
+#		echo "  Password tested: '$password'"
+#		echo "  Result: $result"
+#		echo
 		return 0
 	else
 		echo -e "${RED}FAIL${NC}"
 		echo "Password tested: $password"
 		echo "Expected: $expected"
 		echo "Got: $result"
 		echo
-		return 1
+		exit 1
 	fi
 }
 
@@ -73,4 +76,5 @@ test_basic_password "" "fail" "Empty password"
 test_basic_password "$(printf 'a%.0s' {1..71})" "fail" "Very long password"
 test_basic_password "ljy8zk9aBJ3hA3TXAAMAQe61ytFohJM4SuPFbA4L1xDqV2JDE1n8BCnLN96evcJMWyTkr9y3" "pass" "Max length password"
 test_basic_password "ljy8zk9aBJ3hA3TXAAMAQe61ytFohJM4SuPFbA4L1xDqV2JDE1n8BCnLN96evcJMWyTkr9y312345" "fail" "Max length exceed password"
-echo -e "\nAll basic password validation tests completed!"
+
+echo -e "\nBasic password validation tests completed\n"

tests/test-pwqcheck-length.sh

@@ -4,6 +4,10 @@
 #
 #
 
+set -o pipefail
+
+PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+
 if [ -t 1 ]; then
 # Colors for better visibility
 	GREEN='\033[0;32m'
@@ -22,59 +26,53 @@ test_password() {
 	local expected="$3"
 	local test_name="$4"
 
-    printf "Testing %-40s" "$test_name:"
-
-	PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+	printf "%-40s" "$test_name"
 
 	output=$(echo "$password" | "$PWQCHECK_BIN" -1 "min=$min_params" 2>&1)
 	status=$?
 
 	if [ "$expected" = "pass" -a $status -eq 0 ] || \
 	   [ "$expected" = "fail" -a $status -ne 0 ]; then
 		echo -e "${GREEN}PASS${NC}"
-		echo "  Password tested: '$password'"
-		echo "  Result: $output"
-		echo
+#		echo "  Password tested: '$password'"
+#		echo "  Result: $output"
+#		echo
 	else
 		echo -e "${RED}FAIL${NC}"
 		echo "  Password tested: '$password'"
 		echo "  Expected: $expected"
 		echo "  Got: $output"
 		echo "  Exit status: $status"
 		echo
-		return 1
+		exit 1
 	fi
 }
 
-# Main test suite
-main() {
-	echo "=== Password Length Tests ==="
-	echo
+echo "Password Length Tests"
+echo
 
-	# Test 1: Default minimum lengths
-	test_password "short" "24,12,8,7,6" "fail" "Short password"
-	test_password "ThisIsAVeryLongPasswordThatShouldPass123!" "24,12,8,7,6" "pass" "Long complex password"
+# Test 1: Default minimum lengths
+test_password "short" "24,12,8,7,6" "fail" "Short password"
+test_password "ThisIsAVeryLongPasswordThatShouldPass123!" "24,12,8,7,6" "pass" "Long complex password"
 
-	# Test 2: Custom minimum lengths
-	test_password "pass123" "6,6,6,6,6" "pass" "Password with relaxed mins"
-	test_password "a" "6,6,6,6,6" "fail" "Single character password"
+# Test 2: Custom minimum lengths
+test_password "pass123" "6,6,6,6,6" "pass" "Password with relaxed mins"
+test_password "a" "6,6,6,6,6" "fail" "Single character password"
 
-	# Test 3: Different complexity levels
-	test_password "BearD&Tach" "8,8,8,8,8" "pass" "Simple but long password"
-	test_password "P@ssw0rd!" "8,8,8,8,8" "pass" "Complex password"
+# Test 3: Different complexity levels
+test_password "BearD&Tach" "8,8,8,8,8" "pass" "Simple but long password"
+test_password "P@ssw0rd!" "8,8,8,8,8" "pass" "Complex password"
 
-	# Test 4: Edge cases
-	test_password "YakMeas1" "8,8,8,8,8" "pass" "Exactly minimum length"
-	test_password "7chars" "8,8,8,8,8" "fail" "Below minimum length"
+# Test 4: Edge cases
+test_password "YakMeas1" "8,8,8,8,8" "pass" "Exactly minimum length"
+test_password "7chars" "8,8,8,8,8" "fail" "Below minimum length"
 
-	# Test 5: Different complexity classes
-	echo "Testing complexity classes..."
-	test_password "FigRatMatBatSatWatPatCat" "24,12,8,7,6" "pass" "N0: 24-char basic password"
-	test_password "Complex12Pass" "24,12,8,7,6" "pass" "N1: 12-char mixed password"
-	test_password "P@ss8chr" "24,12,8,7,6" "pass" "N2: 8-char complex password"
-	test_password "P@s7chr" "24,12,8,7,6" "pass" "N3: 7-char complex password"
-	test_password "B!rd5#K" "24,12,8,7,6" "pass" "N4: 6-char highly complex password"
-}
+# Test 5: Different complexity classes
+echo "Testing complexity classes..."
+test_password "FigRatMatBatSatWatPatCat" "24,12,8,7,6" "pass" "N0: 24-char basic password"
+test_password "Complex12Pass" "24,12,8,7,6" "pass" "N1: 12-char mixed password"
+test_password "P@ss8chr" "24,12,8,7,6" "pass" "N2: 8-char complex password"
+test_password "P@s7chr" "24,12,8,7,6" "pass" "N3: 7-char complex password"
+test_password "B!rd5#K" "24,12,8,7,6" "pass" "N4: 6-char highly complex password"
 
-# Run the tests
-main
+echo -e "\nPassword length tests completed\n"

tests/test-pwqcheck-multi.sh

@@ -4,6 +4,10 @@
 #
 #
 
+set -o pipefail
+
+PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+
 if [ -t 1 ]; then
 # Colors for better visibility
 	GREEN='\033[0;32m'
@@ -21,14 +25,11 @@ test_multiple_passwords() {
 	local passwords="$2"
 	local expected_results="$3"
 
-	echo -e "\nRunning Test: ${test_name}"
-	echo "------------------------"
+	printf "%-40s" "$test_name"
 
 	# Create a temporary file for test output
 	local temp_output
-	temp_output=$(mktemp)
-
-	PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+	temp_output=$(mktemp) || exit
 
 	# Run pwqcheck with multiple passwords
 	echo -e "$passwords" | "$PWQCHECK_BIN" --multi -1 > "$temp_output" 2>&1
@@ -38,13 +39,15 @@ test_multiple_passwords() {
 	actual_results=$(cat "$temp_output")
 	if echo "$actual_results" | grep -q "$expected_results"; then
 		echo -e "${GREEN}PASS${NC}"
-		echo "Test output matches expected results"
+#		echo "Test output matches expected results"
 	else
 		echo -e "${RED}FAIL${NC}"
 		echo "Expected:"
 		echo "$expected_results"
 		echo "Got:"
 		cat "$temp_output"
+		rm -f "$temp_output"
+		exit 1
 	fi
 
 	rm -f "$temp_output"
@@ -107,18 +110,20 @@ VeryLongP@ssword123!" \
 OK: medium12345
 OK: VeryLongP@ssword123!"
 
-echo -e "\nAll multiple password tests completed!"
+echo -e "\nMultiple password tests completed\n"
+
+exit 0
 
 # Test 6: Large number of passwords
 echo -e "\nTesting large batch of passwords..."
 {
-    for i in {1..50}; do
-        if [ $((i % 2)) -eq 0 ]; then
-            echo "StrongP@ss${i}!"
-        else
-            echo "weak${i}"
-        fi
-    done
-} | "$PWQCHECK_BIN"  --multi -1
+	for i in {1..50}; do
+		if [ $((i % 2)) -eq 0 ]; then
+			echo "StrongP@ss${i}!"
+		else
+			echo "weak${i}"
+		fi
+	done
+} | "$PWQCHECK_BIN" --multi -1
 
 echo "Large batch test completed!"

tests/test-pwqcheck-similarity.sh

@@ -4,6 +4,10 @@
 #
 #
 
+set -o pipefail
+
+PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+
 if [ -t 1 ]; then
 # Colors for better visibility
 	GREEN='\033[0;32m'
@@ -15,25 +19,24 @@ else
 	NC=''
 fi
 
-
 # Function to run pwqcheck with two passwords
 test_passwords() {
 	local new_pass="$1"
 	local old_pass="$2"
 	local expected_result="$3"
 	local test_name="$4"
 
-	PWQCHECK_BIN="$(dirname "$0")/../pwqcheck"
+	printf "%-40s" "$test_name"
 
 	# Run pwqcheck with both passwords and --similar=deny option
 	result=$(printf "%s\n%s" "$new_pass" "$old_pass" |  "$PWQCHECK_BIN"  -2 similar=deny 2>&1)
 	exit_code=$?
 
 	# Check if the result matches expected
 	if [ $exit_code -eq "$expected_result" ]; then
-		echo -e "${GREEN}✓ PASS:${NC} $test_name"
+		echo -e "${GREEN}PASS${NC}"
 	else
-		echo -e "${RED}✗ FAIL:${NC} $test_name"
+		echo -e "${RED}FAIL${NC}"
 		echo "  Expected exit code: $expected_result, Got: $exit_code"
 		echo "  Output: $result"
 	fi
@@ -42,63 +45,63 @@ test_passwords() {
 
 #add a function to test when similar passwords are permitted
 test_passwords_permit() {
-
 	local new_pass="$1"
 	local old_pass="$2"
 	local expected_result="$3"
 	local test_name="$4"
 
+	printf "%-40s" "$test_name"
+
 	# Run pwqcheck with both passwords and --similar=permit option
-	result=$(printf "%s\n%s" "$new_pass" "$old_pass" | "$PWQCHECK_BIN"  -2  similar=permit 2>&1)
+	result=$(printf "%s\n%s" "$new_pass" "$old_pass" | "$PWQCHECK_BIN" -2 similar=permit 2>&1)
 	exit_code=$?
 
 	# Check if the result matches expected
 	if [ $exit_code -eq "$expected_result" ]; then
-		echo -e "${GREEN}✓ PASS:${NC} $test_name"
-		((TESTS_PASSED++))
+		echo -e "${GREEN}PASS${NC}"
 	else
-		echo -e "${RED}✗ FAIL:${NC} $test_name"
+		echo -e "${RED}FAIL${NC}"
 		echo "  Expected exit code: $expected_result, Got: $exit_code"
 		echo "  Output: $result"
 	fi
 }
 
 # Main testing section
 echo "Running pwqcheck similarity tests with --similar=deny..."
-echo "===================================================="
 
 # Test 1: Identical passwords (should fail with deny)
 test_passwords "ComplexPass123!" "ComplexPass123!" 1 \
-    "Identical passwords should be rejected when similarity is denied"
+    "Identical passwords rejected"
 
 # Test 2: Case variation (should fail with deny)
 test_passwords "ComplexPass123!" "complexpass123!" 1 \
-    "Case variations should be rejected when similarity is denied"
+    "Case variations rejected"
 
 # Test 3: Number substitution (should fail with deny)
 test_passwords "P@ssw0rd123!" "Password123!" 1 \
-    "Common number substitutions should be rejected when similarity is denied"
+    "Common number substitutions rejected"
 
 # Test 4: Different passwords (should pass even with deny)
 test_passwords "ComplexPass123!" "TotallyDifferent456@" 0 \
-    "Different passwords should be accepted even when similarity is denied"
+    "Different passwords accepted"
 
 echo
 echo "Running pwqcheck similarity tests with --similar=permit..."
-echo "====================================================="
 
 # Test 5: Identical passwords (should pass with permit)
 test_passwords_permit "VeryComplexPass#789" "VeryComplexPass#789!" 0 \
-    "Identical passwords should be accepted when similarity is permitted"
+    "Identical passwords accepted"
 
 # Test 6: Case variation (should pass with permit)
 test_passwords_permit "ComplexPass123!" "complexpass123!" 0 \
-    "Case variations should be accepted when similarity is permitted"
+    "Case variations accepted"
 
 # Test 7: Number substitution (should pass with permit)
 test_passwords_permit "P@ssw0rd123!" "Password123!" 0 \
-    "Common number substitutions should be accepted when similarity is permitted"
+    "Common number substitutions accepted"
 
 # Test 8: Different passwords (should pass with permit)
 test_passwords_permit "ComplexPass123!" "TotallyDifferent456@" 0 \
-    "Different passwords should be accepted when similarity is permitted"
+    "Different passwords accepted"
+
+echo -e "\npwqcheck similarity tests completed\n"