gmid.c

@@ -605,8 +605,8 @@ main_print_conf(struct conf *conf)
 
 	TAILQ_FOREACH(h, &conf->hosts, vhosts) {
 		printf("\nserver \"%s\" {\n", h->domain);
-		printf("	cert \"%s\"\n", h->cert_path);
-		printf("	key \"%s\"\n", h->key_path);
+		printf("	cert \"%s\"\n", h->cert);
+		printf("	key \"%s\"\n", h->key);
 		/* TODO: print locations... */
 		printf("}\n");
 	}

regress/regress

@@ -20,9 +20,6 @@ fi
 run_test test_punycode
 run_test test_iri
 
-# Run configuration dumping test.
-run_test test_dump_config
-
 if [ "${SKIP_RUNTIME_TESTS:-0}" -eq 1 ]; then
 	echo
 	echo "======================"

regress/tests.sh

@@ -8,34 +8,6 @@ test_iri() {
 	./iri_test
 }
 
-test_dump_config() {
-	dont_check_server_alive=yes
-	gen_config '' ''
-
-        exp="$(mktemp)"
-	got="$(mktemp)"
-	cat <<EOF >$exp
-prefork 3
-
-server "localhost" {
-	cert "$PWD/localhost.pem"
-	key "$PWD/localhost.key"
-}
-EOF
-
-	$gmid -nn -c reg.conf > $got 2>/dev/null
-
-	ret=0
-	if ! cmp -s "$exp" "$got"; then
-    		echo "config differs!" >&2
-    		diff -u "$exp" "$got" >&2
-    		ret=1
-	fi
-
-	rm "$exp" "$got"
-	return $ret
-}
-
 test_gemexp() {
 	dont_check_server_alive=yes