From 0da46fa5a48dee0ac2be00886a6ed5fe429f20be Mon Sep 17 00:00:00 2001
From: Jon Trowbridge <trow@ximian.com>
Date: Tue, 13 Apr 2004 01:37:57 +0000
Subject: 2004-04-12  Jon Trowbridge  <trow@ximian.com>

	    * bus/config-parser.c (struct BusConfigParser): Added
	    included_files field.
	    (seen_include): Added.  Checks whether or not a file has already
	    been included by any parent BusConfigParser.
	    (bus_config_parser_new): Copy the parent's included_files.
	    (include_file): Track which files have been included, and fail on
	    circular inclusions.
	    (process_test_valid_subdir): Changed printf to report if we are
	    testing valid or invalid conf files.
	    (all_are_equiv): Changed printf to be a bit clearer about
	    what we are actually doing.
	    (bus_config_parser_test): Test invalid configuration files.
---
 test/Makefile.am                               | 9 ++++++++-
 test/data/invalid-config-files/circular-1.conf | 4 ++++
 test/data/invalid-config-files/circular-2.conf | 4 ++++
 test/data/invalid-config-files/circular-3.conf | 4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 test/data/invalid-config-files/circular-1.conf
 create mode 100644 test/data/invalid-config-files/circular-2.conf
 create mode 100644 test/data/invalid-config-files/circular-3.conf

(limited to 'test')

diff --git a/test/Makefile.am b/test/Makefile.am
index 84089517..53170a2b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -69,7 +69,14 @@ TESTDIRS=					\
 	data/valid-config-files			\
 	data/valid-config-files/basic.d		\
 	data/valid-config-files/system.d	\
-	data/valid-service-files
+	data/valid-service-files		\
+	data/invalid-config-files		\
+	data/equiv-config-files			\
+	data/equiv-config-files/basic		\
+	data/equiv-config-files/basic/basic.d	\
+	data/equiv-config-files/entities	\
+	data/equiv-config-files/entities/basic.d
+
 
 FIND_TESTS=find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
 
diff --git a/test/data/invalid-config-files/circular-1.conf b/test/data/invalid-config-files/circular-1.conf
new file mode 100644
index 00000000..faa895a3
--- /dev/null
+++ b/test/data/invalid-config-files/circular-1.conf
@@ -0,0 +1,4 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+<include>circular-1.conf</include>
+</busconfig>
\ No newline at end of file
diff --git a/test/data/invalid-config-files/circular-2.conf b/test/data/invalid-config-files/circular-2.conf
new file mode 100644
index 00000000..46a7e78e
--- /dev/null
+++ b/test/data/invalid-config-files/circular-2.conf
@@ -0,0 +1,4 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+<include>circular-3.conf</include>
+</busconfig>
\ No newline at end of file
diff --git a/test/data/invalid-config-files/circular-3.conf b/test/data/invalid-config-files/circular-3.conf
new file mode 100644
index 00000000..87e354d9
--- /dev/null
+++ b/test/data/invalid-config-files/circular-3.conf
@@ -0,0 +1,4 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+<include>circular-2.conf</include>
+</busconfig>
\ No newline at end of file
-- 
cgit