--- libaitcfg/example/test.c	2012/04/03 09:21:06	1.1.2.8
+++ libaitcfg/example/test.c	2012/04/03 14:42:30	1.1.2.13
@@ -2,6 +2,7 @@
 #include <sys/types.h>
 #include <aitcfg.h>
 
+
 int main()
 {
 	cfg_root_t lst, tmp;
@@ -28,24 +29,26 @@ int main()
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", "attr2"));
 	printf("GetAttribute value=%s\n", cfg_getAttribute(&lst, "global", "attr2"));
 
-//	printf("SetAttribute=%d\n", cfg_setAttribute(&lst, "section", "attr3", NULL));
-//	printf("LoadValue=%d :: ", cfg_loadAttribute(&lst, "section", "attr3", &v, "iH"));
-//	printf("Str=%s\n", AIT_GET_STR(&v));
-//	AIT_FREE_VAL(&v);
-//	printf("LoadValue=%d :: ", cfg_loadAttribute(&lst, "", "testattr", &v, "iH2"));
-//	printf("Str=%s\n", AIT_GET_STR(&v));
-//	AIT_FREE_VAL(&v);
+	printf("SetAttribute=%d\n", cfg_setAttribute(&lst, "section", "attr3", NULL));
+	printf("LoadValue=%d :: ", cfg_loadAttribute(&lst, "section", "attr3", &v, "iH"));
+	printf("Str=%s\n", AIT_GET_STR(&v));
+	AIT_FREE_VAL(&v);
+	printf("LoadValue=%d :: ", cfg_loadAttribute(&lst, "", "testattr", &v, "iH2"));
+	printf("Str=%s\n", AIT_GET_STR(&v));
+	AIT_FREE_VAL(&v);
 
-//	printf("GetAttribute value=%s\n", cfg_getAttribute(&lst, "section1", "attrtest"));
+	printf("GetAttribute value=%s\n", cfg_getAttribute(&lst, "section1", "attrtest"));
 	cfgUnloadConfig(&lst);
 	printf("0) ---------------------------------\n");
 
-/*
+	printf("size lst=%d tmp=%d %d\n", sizeof lst, sizeof tmp, sizeof(pthread_mutex_t));
+
 	cfgInitConfig(&tmp);
 	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "piuk", "blahz"));
 	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "bzyt", "00", "99999"));
 	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "gniah", "tiiiiiii"));
 	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, NULL, "att", "0001122777777"));
+
 	cfgInitConfig(&lst);
 	printf("SetAttribute=%d\n", cfg_setAttribute(&lst, NULL, "zzz", "ZZZ"));
 	printf("SetAttribute=%d\n", cfg_setAttribute(&lst, NULL, "att", "0001122222222222"));
@@ -56,26 +59,38 @@ int main()
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", ""));
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, NULL, "att"));
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", "attr2"));
-	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999"));
+	printf("SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999"));
 
 	cfgWriteConfig(stdout, &tmp, 0);
 	cfgWriteConfig(stdout, &lst, 1);
-	*/
 	printf("1) ---------------------------------\n");
-#if 0
-	printf("%d\n---------------------------------\n", MergeConfig(&lst, &tmp));
-	WriteConfig(stdout, &lst);
-//	printf("%d\n---------------------------------\n", ConcatConfig(&lst, &tmp));
-//	WriteConfig(stdout, &lst);
-	printf("%d\n---------------------------------\n", ConcatConfig(&lst, &tmp));
-	WriteConfig(stdout, &lst);
 
-	printf("CreateConfig=%d\n", CreateConfig("test4e.cfg", &lst));
-	printf("errno=%d error=%s\n", cfg_GetErrno(), cfg_GetError());
+#ifndef SKIP_TEST_CONCAT
+	printf("concat=%d\n---------------------------------\n", cfgConcatConfig(&lst, &tmp));
+	cfgWriteConfig(stdout, &lst, 0);
+	printf("concat=%d\n---------------------------------\n", cfgConcatConfig(&lst, &tmp));
+	cfgWriteConfig(stdout, &lst, 1);
+#else
+	cfgUnloadConfig(&tmp);
 #endif
-	/*
-	cfgUnloadConfig(&lst);
+
+	cfgInitConfig(&tmp);
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "piuk", "blahz"));
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "bzyt", "00", "99999"));
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "gniah", "tiiiiiii"));
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, NULL, "att", "0001122777777"));
+
+#ifndef SKIP_TEST_MERGE
+	printf("merge=%d\n---------------------------------\n", cfgMergeConfig(&lst, &tmp));
+	cfgWriteConfig(stdout, &lst, 1);
+#else
 	cfgUnloadConfig(&tmp);
-	*/
+#endif
+
+	printf("CreateConfig=%d\n", cfgCreateConfig("test4e.cfg", &lst, 1));
+	printf("errno=%d error=%s\n", cfg_GetErrno(), cfg_GetError());
+
+	cfgUnloadConfig(&tmp);
+	cfgUnloadConfig(&lst);
 	return 0;
 }