eio: refactoring eio utc

Change-Id: I46eec11b9c621b92914cb90c03979348391edf52

diff --git a/TC/build.sh b/TC/build.sh
index 5fb471644ed2907d024204ecef83de60ce1e7c33..d80fa23016a0140871275baf461e3147f80ad0a7 100755 (executable)
--- a/TC/build.sh
+++ b/TC/build.sh
@@ -159,6 +159,10 @@ while read line_libs; do
                                        cd ecore
                                        ./build.sh &> "result.txt"
                                        cd ..
+                               elif [[ "$line_libs" =~ "EIO" ]]; then
+                                       cd eio
+                                       ./build.sh &> "result.txt"
+                                       cd ..
                                fi
                                isBuildScen=0
                                break;

diff --git a/TC/eio/Makefile b/TC/eio/Makefile
new file mode 100644 (file)
index 0000000..6561085
--- /dev/null
+++ b/TC/eio/Makefile
@@ -0,0 +1,23 @@
+CC ?= gcc
+
+C_FILES = $(shell cat tslist)
+
+PKGS = eina eet eio ecore check
+
+LDFLAGS = `pkg-config --libs $(PKGS)`
+
+CFLAGS = -I. `pkg-config --cflags $(PKGS)`
+CFLAGS += -Wall -lm
+
+#TARGETS = $(C_FILES:%.c=tc-%)
+TCS := $(shell ls -1 *.c | cut -d. -f1)
+
+RESOURCES := $(shell find . -name '*.o')
+
+all: $(TCS)
+
+%: %.c
+       $(CC) -g -O0 -o $@ $< $(RESOURCES) $(CFLAGS) $(LDFLAGS)
+
+clean:
+       rm -f $(TCS)

diff --git a/TC/eio/build.sh b/TC/eio/build.sh
new file mode 100755 (executable)
index 0000000..da14077
--- /dev/null
+++ b/TC/eio/build.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+function make_arr()
+{
+   for dir in */; do
+      cd $dir
+      for filename in *.o; do
+         echo $filename
+         if [[ "$filename" == "*.o" ]]; then
+           continue
+         fi
+         filename=(${filename//./ })
+         printf "  { \"%s\", _%s },\n" $filename $filename >> "../"$HEADER_NAME
+      done
+      cd ..
+   done
+}
+
+function make_def()
+{
+   for dir in */; do
+      cd $dir
+      for filename in *.o; do
+         if [[ "$filename" == "*.o" ]]; then
+           continue
+         fi
+         filename=(${filename//./ })
+         printf "TCase *_%s();\n" $filename >> "../"$HEADER_NAME
+      done
+      cd ..
+   done
+}
+HEADER_NAME=utc_eio.h
+rm $HEADER_NAME
+touch $HEADER_NAME
+printf "#include <check.h>\n" >> $HEADER_NAME
+printf "#include \"../utc_negative_unitest.h\"\n\n" >> $HEADER_NAME
+
+make_def
+printf "const Efl_Test_Case %s[] = {\n" "utc" >> $HEADER_NAME
+make_arr
+printf "  { NULL, NULL }\n" >> $HEADER_NAME
+printf "};" >> $HEADER_NAME
+
+make

diff --git a/TC/eio/eio_eet/Makefile b/TC/eio/eio_eet/Makefile
index 4b393676e72b6da6a95a4eb8e4b70724d95dd103..eb3da6ee08449287f4102296b98ed8464fade24b 100644 (file)
--- a/TC/eio/eio_eet/Makefile
+++ b/TC/eio/eio_eet/Makefile
@@ -15,7 +15,7 @@ TCS := $(shell ls -1 *.c | cut -d. -f1)
 all: $(TCS)
 
 %: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+       $(CC) -c -o $@.o $< $(CFLAGS) $(LDFLAGS)
 
 clean:
        rm -f $(TCS)

diff --git a/TC/eio/eio_eet/utc_eio_eet_data_image_write_cipher.c b/TC/eio/eio_eet/utc_eio_eet_data_image_write_cipher.c
index c120aa7a0742ad4864845c963138f6cac270f426..ceb771b7018562c71a072a8b1bf6c90c3e52c416 100644 (file)
--- a/TC/eio/eio_eet/utc_eio_eet_data_image_write_cipher.c
+++ b/TC/eio/eio_eet/utc_eio_eet_data_image_write_cipher.c
@@ -272,32 +272,12 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_eet_data_image_write_cipher");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_eet_data_image_write_cipher()
+{
+   TCase *tcase = tcase_create("utc_eio_eet_data_image_write_cipher");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_eet_data_image_write_cipher_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_eet_data_image_write_cipher.log");
-   srunner_set_xml(srunner, "utc_eio_eet_data_image_write_cipher.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_eet/utc_eio_eet_data_write_read.c b/TC/eio/eio_eet/utc_eio_eet_data_write_read.c
index bd17d1b62b31990367b20de2f59b3b2e4e011a6b..0297151d657948343959433fa5ea415ac4b1fa3e 100644 (file)
--- a/TC/eio/eio_eet/utc_eio_eet_data_write_read.c
+++ b/TC/eio/eio_eet/utc_eio_eet_data_write_read.c
@@ -249,32 +249,12 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_eet_data_write_read");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_eet_data_write_read()
+{
+   TCase *tcase = tcase_create("utc_eio_eet_data_write_read");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_eet_data_write_read_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_eet_data_write_read.log");
-   srunner_set_xml(srunner, "utc_eio_eet_data_write_read.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_eet/utc_eio_eet_direct.c b/TC/eio/eio_eet/utc_eio_eet_direct.c
index 4faccba7488d2229623121ccc1c690b2c7675dd9..e6317373fa37266501422cf7eb48b381e0582d60 100644 (file)
--- a/TC/eio/eio_eet/utc_eio_eet_direct.c
+++ b/TC/eio/eio_eet/utc_eio_eet_direct.c
@@ -215,32 +215,12 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_eet_direct");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_eet_direct()
+{
+   TCase *tcase = tcase_create("utc_eio_eet_direct");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_eet_direct_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_eet_direct.log");
-   srunner_set_xml(srunner, "utc_eio_eet_direct.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_eet/utc_eio_eet_write_read.c b/TC/eio/eio_eet/utc_eio_eet_write_read.c
index 812d0a3db7f6b9fc0843cafe38161fb14886ff66..1f10c78de56bdd3af0b416d177a0a2d82b0147c0 100644 (file)
--- a/TC/eio/eio_eet/utc_eio_eet_write_read.c
+++ b/TC/eio/eio_eet/utc_eio_eet_write_read.c
@@ -217,32 +217,12 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_eet_write_read");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_eet_write_read()
+{
+   TCase *tcase = tcase_create("utc_eio_eet_write_read");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_eet_write_read_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_eet_write_read.log");
-   srunner_set_xml(srunner, "utc_eio_eet_write_read.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_file/Makefile b/TC/eio/eio_file/Makefile
index 7e2cf717ecc8c9404524bf02b1e5c2b1a9b384a3..396ee8c9bd6dd9acd63643c4285265187ddf974e 100644 (file)
--- a/TC/eio/eio_file/Makefile
+++ b/TC/eio/eio_file/Makefile
@@ -15,7 +15,7 @@ TCS := $(shell ls -1 *.c | cut -d. -f1)
 all: $(TCS)
 
 %: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+       $(CC) -c -o $@.o $< $(CFLAGS) $(LDFLAGS)
 
 clean:
        rm -f $(TCS)

diff --git a/TC/eio/eio_file/utc_eio_file.c b/TC/eio/eio_file/utc_eio_file.c
index c0dc4849bd5bb74b55d6a89b64f808859d9a243b..31e4faae45d2a236082850b7625fe8ea30b2de6e 100644 (file)
--- a/TC/eio/eio_file/utc_eio_file.c
+++ b/TC/eio/eio_file/utc_eio_file.c
@@ -254,33 +254,13 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_file");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_file()
+{
+   TCase *tcase = tcase_create("utc_eio_file");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_file_chown_p);
    tcase_add_test(tcase, utc_eio_file_cancel_check_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_file.log");
-   srunner_set_xml(srunner, "utc_eio_file.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_file/utc_eio_file_associate.c b/TC/eio/eio_file/utc_eio_file_associate.c
index 91f630b453b78358e245ddf53d3a3a182b502055..506ec8f93d782b2c0231fc440c716a37b788ca77 100644 (file)
--- a/TC/eio/eio_file/utc_eio_file_associate.c
+++ b/TC/eio/eio_file/utc_eio_file_associate.c
@@ -202,33 +202,13 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_file_associate");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_file_associate()
+{
+   TCase *tcase = tcase_create("utc_eio_file_associate");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_file_associate_p1);
    tcase_add_test(tcase, utc_eio_file_associate_p2);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_file_associate.log");
-   srunner_set_xml(srunner, "utc_eio_file_associate.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_file/utc_eio_file_functional.c b/TC/eio/eio_file/utc_eio_file_functional.c
index e3232ce03feecceba332902a222b0ba82eec7920..ff4a6dd8c67905cf9c5867b6389bf3ab56cff204 100644 (file)
--- a/TC/eio/eio_file/utc_eio_file_functional.c
+++ b/TC/eio/eio_file/utc_eio_file_functional.c
@@ -560,31 +560,14 @@ END_TEST
  *@}
  */
 
-Suite *
-test_suite(void)
+
+TCase * _utc_eio_file_functional()
 {
-   Suite *suite = suite_create("utc_eio_file_functional");
-   TCase *tcase = tcase_create("TCase");
+   TCase *tcase = tcase_create("utc_eio_file_functional");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_file_ls);
    tcase_add_test(tcase, utc_eio_file_file);
    tcase_add_test(tcase, utc_eio_file_open);
-   suite_add_tcase(suite, tcase);
-   return suite;
-}
-
-
-int
-main()
-{
-   int number_failed;
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_file_functional.log");
-   srunner_set_xml(srunner, "utc_eio_file_functional.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_file/utc_eio_file_map.c b/TC/eio/eio_file/utc_eio_file_map.c
index 23e5d215a81405ae0109e6b402bf4cb14a634a99..068266776440c0172e7283173d19e8d672ce1373 100644 (file)
--- a/TC/eio/eio_file/utc_eio_file_map.c
+++ b/TC/eio/eio_file/utc_eio_file_map.c
@@ -153,29 +153,12 @@ END_TEST
  *@}
  */
 
-Suite *
-test_suite(void)
+
+TCase * _utc_eio_file_map()
 {
-   Suite *suite = suite_create("utc_eio_file_map");
-   TCase *tcase = tcase_create("TCase");
+   TCase *tcase = tcase_create("utc_eio_file_map");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_file_map_simple);
-   suite_add_tcase(suite, tcase);
-   return suite;
-}
-
-
-int
-main()
-{
-   int number_failed;
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_file_map.log");
-   srunner_set_xml(srunner, "utc_eio_file_map.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_file/utc_eio_file_xattr.c b/TC/eio/eio_file/utc_eio_file_xattr.c
index 31046149ca1d25c79b5ea1b91e03dd4df3f100b3..f20973d52eb2f7017d37baeb2c8fc2b2553c8a34 100644 (file)
--- a/TC/eio/eio_file/utc_eio_file_xattr.c
+++ b/TC/eio/eio_file/utc_eio_file_xattr.c
@@ -379,30 +379,13 @@ END_TEST
  *@}
  */
 
-Suite *
-test_suite(void)
+
+TCase * _utc_eio_file_xattr()
 {
-   Suite *suite = suite_create("utc_eio_file_xattr");
-   TCase *tcase = tcase_create("TCase");
+   TCase *tcase = tcase_create("utc_eio_file_xattr");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_file_xattr_set);
    tcase_add_test(tcase, utc_eio_file_xattr_types_set);
-   suite_add_tcase(suite, tcase);
-   return suite;
-}
-
-
-int
-main()
-{
-   int number_failed;
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_file_xattr.log");
-   srunner_set_xml(srunner, "utc_eio_file_xattr.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_memory/Makefile b/TC/eio/eio_memory/Makefile
index 4b393676e72b6da6a95a4eb8e4b70724d95dd103..eb3da6ee08449287f4102296b98ed8464fade24b 100644 (file)
--- a/TC/eio/eio_memory/Makefile
+++ b/TC/eio/eio_memory/Makefile
@@ -15,7 +15,7 @@ TCS := $(shell ls -1 *.c | cut -d. -f1)
 all: $(TCS)
 
 %: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+       $(CC) -c -o $@.o $< $(CFLAGS) $(LDFLAGS)
 
 clean:
        rm -f $(TCS)

diff --git a/TC/eio/eio_memory/utc_eio_memory_burst_limit_get_set.c b/TC/eio/eio_memory/utc_eio_memory_burst_limit_get_set.c
index 79a434155b314ddb51948f0ebcb0c4b747796d74..4ab4740d845a6d21f3ce7b761dc612f4a7bcae57 100644 (file)
--- a/TC/eio/eio_memory/utc_eio_memory_burst_limit_get_set.c
+++ b/TC/eio/eio_memory/utc_eio_memory_burst_limit_get_set.c
@@ -63,32 +63,12 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_memory_burst_limit_get_set");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_memory_burst_limit_get_set()
+{
+   TCase *tcase = tcase_create("utc_eio_memory_burst_limit_get_set");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_memory_burst_limit_get_set_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_memory_burst_limit_get_set.log");
-   srunner_set_xml(srunner, "utc_eio_memory_burst_limit_get_set.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_model/Makefile b/TC/eio/eio_model/Makefile
index 3ebd34ca04eaada824104887312c03a0815ce84a..9e301b5c3564744b02b9005b0d04f871ff51a96a 100644 (file)
--- a/TC/eio/eio_model/Makefile
+++ b/TC/eio/eio_model/Makefile
@@ -15,7 +15,7 @@ TCS := $(shell ls -1 *.c | cut -d. -f1)
 all: $(TCS)
 
 %: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+       $(CC) -c -o $@.o $< $(CFLAGS) $(LDFLAGS)
 
 clean:
        rm -f $(TCS)

diff --git a/TC/eio/eio_model/utc_eio_model.c b/TC/eio/eio_model/utc_eio_model.c
index db1a1f7413910f4a41fa3a10b3f7a1cb39fa1077..a05fb198888042151e8662c5e75b1a86516f4fa6 100644 (file)
--- a/TC/eio/eio_model/utc_eio_model.c
+++ b/TC/eio/eio_model/utc_eio_model.c
@@ -112,32 +112,12 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("utc_eio_model");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_model()
+{
+   TCase *tcase = tcase_create("utc_eio_model");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_model_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_model.log");
-   srunner_set_xml(srunner, "utc_eio_model.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_monitor/Makefile b/TC/eio/eio_monitor/Makefile
index 1c9b525733418652352b8bf1f8f0c894981609e2..d2343a37c5673e1b9e650618a4dbc00f3a011b3d 100644 (file)
--- a/TC/eio/eio_monitor/Makefile
+++ b/TC/eio/eio_monitor/Makefile
@@ -15,7 +15,7 @@ TCS := $(shell ls -1 *.c | cut -d. -f1)
 all: $(TCS)
 
 %: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+       $(CC) -c -o $@.o $< $(CFLAGS) $(LDFLAGS)
 
 clean:
        rm -f $(TCS)

diff --git a/TC/eio/eio_monitor/utc_eio_monitor.c b/TC/eio/eio_monitor/utc_eio_monitor.c
index f12dd4f05de83346cb440295fdffda1fe6302edb..50afd59b90f0e87a0e66d7503a10c00861ad17df 100644 (file)
--- a/TC/eio/eio_monitor/utc_eio_monitor.c
+++ b/TC/eio/eio_monitor/utc_eio_monitor.c
@@ -165,32 +165,12 @@ END_TEST
 /**
  *@}
  */
-Suite *
-test_suite(void)
-{
-   Suite *suite = suite_create("eio_monitor");
 
-   TCase *tcase = tcase_create("TCase");
+TCase * _utc_eio_monitor()
+{
+   TCase *tcase = tcase_create("utc_eio_monitor");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_monitor_p);
-   suite_add_tcase(suite, tcase);
-
-   return suite;
-}
-
-int
-main()
-{
-   int number_failed;
-
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_monitor.log");
-   srunner_set_xml(srunner, "utc_eio_monitor.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/eio_monitor/utc_eio_monitor_add.c b/TC/eio/eio_monitor/utc_eio_monitor_add.c
index 0497d2d6870f7c151d625c12afa1763ded265119..e6fdf38f985615cab6d3c48451274594fcee025c 100644 (file)
--- a/TC/eio/eio_monitor/utc_eio_monitor_add.c
+++ b/TC/eio/eio_monitor/utc_eio_monitor_add.c
@@ -96,29 +96,12 @@ END_TEST
  *@}
  */
 
-Suite *
-test_suite(void)
+
+TCase * _utc_eio_monitor_add()
 {
-   Suite *suite = suite_create("utc_eio_monitor_add");
-   TCase *tcase = tcase_create("TCase");
+   TCase *tcase = tcase_create("utc_eio_monitor_add");
    tcase_set_timeout(tcase, 30);
    tcase_add_checked_fixture(tcase, setup, teardown);
    tcase_add_test(tcase, utc_eio_monitor_add_and_remove);
-   suite_add_tcase(suite, tcase);
-   return suite;
-}
-
-
-int
-main()
-{
-   int number_failed;
-   Suite *suite = test_suite();
-   SRunner *srunner = srunner_create(suite);
-   srunner_set_log(srunner, "utc_eio_monitor_add.log");
-   srunner_set_xml(srunner, "utc_eio_monitor_add.xml");
-   srunner_run_all(srunner, CK_NORMAL);
-   number_failed = srunner_ntests_failed(srunner);
-   srunner_free(srunner);
-   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+   return tcase;
 }

diff --git a/TC/eio/utc_eio.c b/TC/eio/utc_eio.c
new file mode 100644 (file)
index 0000000..b504e1a
--- /dev/null
+++ b/TC/eio/utc_eio.c
@@ -0,0 +1,73 @@
+#include <check.h>
+#include "utc_eio.h"
+#include "../utc_negative_unitest.h"
+
+static char exception_list[100][100];
+
+static int
+test_case_validate(const char *tname)
+{
+   int i = 0;
+   for (i = 0; exception_list[i][0]; i++)
+     {
+        if (!strcmp(exception_list[i], tname)) return -1;
+     }
+
+   return 1;
+}
+
+static void
+tcase_get(Suite *s, const char **argv)
+{
+   int i;
+   FILE *fp;
+
+   if (argv[1])
+     {
+        for (i = 0; utc[i].test_case; i++)
+          {
+             if (!strcmp(argv[1], utc[i].test_case))
+               {
+                  suite_add_tcase(s, utc[i].tc_get());
+                  return;
+               }
+          }
+     }
+
+   fp = fopen("eio_exception_list", "r");
+   if (fp)
+     {
+        for (i = 0; ; i++)
+          {
+             if (fscanf(fp, "%s", exception_list[i]) < 0)
+               {
+                  exception_list[i][0] = 0;
+                  break;
+               }
+          }
+        fclose(fp);
+     }
+   for (i = 0; utc[i].test_case; i++)
+     {
+        if (test_case_validate(utc[i].test_case) < 0) continue;
+        suite_add_tcase(s, utc[i].tc_get());
+     }
+   return;
+}
+
+int
+main(int argc, const char **argv)
+{
+   int number_failed;
+
+   Suite *suite = suite_create("utc_eio");
+   tcase_get(suite, argv);
+   SRunner *srunner = srunner_create(suite);
+   srunner_set_log(srunner, "utc_eio.log");
+   srunner_set_xml(srunner, "utc_eio.xml");
+   srunner_run_all(srunner, CK_NORMAL);
+   number_failed = srunner_ntests_failed(srunner);
+   srunner_free(srunner);
+
+   return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

diff --git a/TC/execute.sh b/TC/execute.sh
index 781fadef18d2c96359da5b82ebae52259b7eb086..73ac192a266d97840cadbdf6d4dae78c96054a69 100755 (executable)
--- a/TC/execute.sh
+++ b/TC/execute.sh
@@ -161,6 +161,7 @@ FileLibsScen=$SCENS_DIR/libs_that_sould_be_exec.txt
 elm_exception_list="elementary/elm_exception_list"
 eina_exception_list="eina/eina_exception_list"
 ecore_exception_list="ecore/ecore_exception_list"
+eio_exception_list="eio/eio_exception_list"
 filename="tet_scen"
 echo Start
 
@@ -352,6 +353,31 @@ while read line_libs; do
                                        cd $before_path
 
                                        rm $ecore_exception_list
+                               elif [[ "$line_libs" =~ "EIO" ]]; then
+                                       sed -i 's/ //g' $eio_exception_list
+                                       sed -i 's/#//g' $eio_exception_list
+                                       sed -i 's/DEPRECATED//g' $eio_exception_list
+                                       sed -i 's/\.c//g' $eio_exception_list
+                                       before_path=`pwd`
+                                       cd eio
+
+                                       ./utc_eio &> /dev/null
+
+                                       #add log result to execute file
+                                       tc_log_file="utc_eio.log"
+                                       cat $tc_log_file >> $before_path"/$JOURNAL_RESULT";
+                                       #delete check log
+                                       rm -rf $tc_log_file
+
+                                       #add xml result to execute file
+                                       tc_xml_file="utc_eio.xml"
+                                       cat $tc_xml_file >> $before_path"/$XML_RESULT";
+                                       #delete check xml
+                                       rm -rf $tc_xml_file
+
+                                       cd $before_path
+
+                                       rm $eio_exception_list
                                fi
                                echo "End modules execute Lib Scen";
                                echo $line_scen;