summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorDmitri Pal <dpal@redhat.com>2010-12-26 00:15:12 -0500
committerStephen Gallagher <sgallagh@redhat.com>2012-04-05 11:20:08 -0700
commitc631e86ab3cd0b9284c4d1c40c8834b4677939dd (patch)
treee4b5ecd2625e7e4755eaf6c2083598aa58948475 /Makefile.am
parentd34f8dd6d9d6888da3e1535233196d41aa403d72 (diff)
downloadding-libs2-c631e86ab3cd0b9284c4d1c40c8834b4677939dd.tar.gz
ding-libs2-c631e86ab3cd0b9284c4d1c40c8834b4677939dd.tar.xz
ding-libs2-c631e86ab3cd0b9284c4d1c40c8834b4677939dd.zip
New test files for section merge
smerge.conf - test file sexpect.conf - file contains output of the smerge.conf processed in different merge modes for sections and values
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 0946169..aa73a8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,7 +250,9 @@ dist_noinst_DATA += \
ini/ini.d/test.conf \
ini/ini.d/ipa.conf \
ini/ini.d/foo.conf \
- ini/ini.d/mysssd.conf
+ ini/ini.d/mysssd.conf \
+ ini/ini.d/smerge.conf \
+ ini/ini.d/sexpect.conf
check_PROGRAMS += \
ini_config_ut \