q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f19a905261c6b02f788ce7b5167223555d324712
commit f19a905261c6b02f788ce7b5167223555d324712 Author: Daniel Kolesa <[email protected]> Date: Fri Nov 10 19:42:43 2017 +0100 eolian: fix generation tests --- src/tests/eolian/data/class_simple_ref_eo.h | 4 +- src/tests/eolian/data/class_simple_ref_legacy.h | 4 +- src/tests/eolian/data/docs_ref.h | 4 +- src/tests/eolian/data/docs_ref_legacy.h | 4 +- src/tests/eolian/data/function_as_argument_ref.h | 4 +- src/tests/eolian/data/function_types_ref.h | 4 +- src/tests/eolian/data/import_types_ref.h | 4 +- .../eolian/data/{struct_ref.c => struct_ref.h} | 4 +- .../data/{struct_ref_stub.c => struct_ref_stub.h} | 4 +- .../eolian/data/{typedef_ref.c => typedef_ref.h} | 4 +- .../{typedef_ref_stub.c => typedef_ref_stub.h} | 4 +- src/tests/eolian/eolian_generation.c | 56 +++++++++++----------- 12 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h index 9a5ddcd5c7..16a690decc 100644 --- a/src/tests/eolian/data/class_simple_ref_eo.h +++ b/src/tests/eolian/data/class_simple_ref_eo.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_CLASS_SIMPLE_H_ -#define _EOLIAN_CLASS_SIMPLE_H_ +#ifndef _EOLIAN_CLASS_SIMPLE_EO_H_ +#define _EOLIAN_CLASS_SIMPLE_EO_H_ #ifndef _CLASS_SIMPLE_EO_CLASS_TYPE #define _CLASS_SIMPLE_EO_CLASS_TYPE diff --git a/src/tests/eolian/data/class_simple_ref_legacy.h b/src/tests/eolian/data/class_simple_ref_legacy.h index a4bd977063..39320a4ddb 100644 --- a/src/tests/eolian/data/class_simple_ref_legacy.h +++ b/src/tests/eolian/data/class_simple_ref_legacy.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_CLASS_SIMPLE_LEGACY_H_ -#define _EOLIAN_CLASS_SIMPLE_LEGACY_H_ +#ifndef _EOLIAN_CLASS_SIMPLE_EO_LEGACY_H_ +#define _EOLIAN_CLASS_SIMPLE_EO_LEGACY_H_ #ifndef _CLASS_SIMPLE_EO_CLASS_TYPE #define _CLASS_SIMPLE_EO_CLASS_TYPE diff --git a/src/tests/eolian/data/docs_ref.h b/src/tests/eolian/data/docs_ref.h index d8002b8abf..7eb3014755 100644 --- a/src/tests/eolian/data/docs_ref.h +++ b/src/tests/eolian/data/docs_ref.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_DOCS_H_ -#define _EOLIAN_DOCS_H_ +#ifndef _EOLIAN_DOCS_EO_H_ +#define _EOLIAN_DOCS_EO_H_ #ifndef _DOCS_EO_CLASS_TYPE #define _DOCS_EO_CLASS_TYPE diff --git a/src/tests/eolian/data/docs_ref_legacy.h b/src/tests/eolian/data/docs_ref_legacy.h index 75aad8bfb4..5b0d7d679c 100644 --- a/src/tests/eolian/data/docs_ref_legacy.h +++ b/src/tests/eolian/data/docs_ref_legacy.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_DOCS_LEGACY_H_ -#define _EOLIAN_DOCS_LEGACY_H_ +#ifndef _EOLIAN_DOCS_EO_LEGACY_H_ +#define _EOLIAN_DOCS_EO_LEGACY_H_ #ifndef _DOCS_EO_CLASS_TYPE #define _DOCS_EO_CLASS_TYPE diff --git a/src/tests/eolian/data/function_as_argument_ref.h b/src/tests/eolian/data/function_as_argument_ref.h index 16af4285d2..61179c5346 100644 --- a/src/tests/eolian/data/function_as_argument_ref.h +++ b/src/tests/eolian/data/function_as_argument_ref.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_FUNCTION_POINTERS_H_ -#define _EOLIAN_FUNCTION_POINTERS_H_ +#ifndef _EOLIAN_FUNCTION_POINTERS_EO_H_ +#define _EOLIAN_FUNCTION_POINTERS_EO_H_ #ifndef _FUNCTION_AS_ARGUMENT_EO_CLASS_TYPE #define _FUNCTION_AS_ARGUMENT_EO_CLASS_TYPE diff --git a/src/tests/eolian/data/function_types_ref.h b/src/tests/eolian/data/function_types_ref.h index dcb8af2525..a53ba715d2 100644 --- a/src/tests/eolian/data/function_types_ref.h +++ b/src/tests/eolian/data/function_types_ref.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_FUNCTION_POINTERS_H_ -#define _EOLIAN_FUNCTION_POINTERS_H_ +#ifndef _EOLIAN_FUNCTION_POINTERS_EOT_H_ +#define _EOLIAN_FUNCTION_POINTERS_EOT_H_ #ifndef _FUNCTION_TYPES_EOT_TYPES #define _FUNCTION_TYPES_EOT_TYPES diff --git a/src/tests/eolian/data/import_types_ref.h b/src/tests/eolian/data/import_types_ref.h index 9dcb3cd98d..19863ba53d 100644 --- a/src/tests/eolian/data/import_types_ref.h +++ b/src/tests/eolian/data/import_types_ref.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_IMPORT_TYPES_H_ -#define _EOLIAN_IMPORT_TYPES_H_ +#ifndef _EOLIAN_IMPORT_TYPES_EOT_H_ +#define _EOLIAN_IMPORT_TYPES_EOT_H_ #ifndef _IMPORT_TYPES_EOT_TYPES #define _IMPORT_TYPES_EOT_TYPES diff --git a/src/tests/eolian/data/struct_ref.c b/src/tests/eolian/data/struct_ref.h similarity index 91% rename from src/tests/eolian/data/struct_ref.c rename to src/tests/eolian/data/struct_ref.h index 60b4369bce..6e6299b3dc 100644 --- a/src/tests/eolian/data/struct_ref.c +++ b/src/tests/eolian/data/struct_ref.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_TYPEDEF_H_ -#define _EOLIAN_TYPEDEF_H_ +#ifndef _EOLIAN_TYPEDEF_EO_H_ +#define _EOLIAN_TYPEDEF_EO_H_ #ifndef _STRUCT_EO_CLASS_TYPE #define _STRUCT_EO_CLASS_TYPE diff --git a/src/tests/eolian/data/struct_ref_stub.c b/src/tests/eolian/data/struct_ref_stub.h similarity index 60% rename from src/tests/eolian/data/struct_ref_stub.c rename to src/tests/eolian/data/struct_ref_stub.h index 19ed7140c0..5ef89d3c1a 100644 --- a/src/tests/eolian/data/struct_ref_stub.c +++ b/src/tests/eolian/data/struct_ref_stub.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_TYPEDEF_STUB_H_STUBS -#define _EOLIAN_TYPEDEF_STUB_H_STUBS +#ifndef _EOLIAN_TYPEDEF_EO_STUB_H_STUBS +#define _EOLIAN_TYPEDEF_EO_STUB_H_STUBS typedef Eo Struct; diff --git a/src/tests/eolian/data/typedef_ref.c b/src/tests/eolian/data/typedef_ref.h similarity index 92% rename from src/tests/eolian/data/typedef_ref.c rename to src/tests/eolian/data/typedef_ref.h index 24d4bc6260..ffae7bc332 100644 --- a/src/tests/eolian/data/typedef_ref.c +++ b/src/tests/eolian/data/typedef_ref.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_TYPEDEF_H_ -#define _EOLIAN_TYPEDEF_H_ +#ifndef _EOLIAN_TYPEDEF_EO_H_ +#define _EOLIAN_TYPEDEF_EO_H_ #ifndef _TYPEDEF_EO_CLASS_TYPE #define _TYPEDEF_EO_CLASS_TYPE diff --git a/src/tests/eolian/data/typedef_ref_stub.c b/src/tests/eolian/data/typedef_ref_stub.h similarity index 70% rename from src/tests/eolian/data/typedef_ref_stub.c rename to src/tests/eolian/data/typedef_ref_stub.h index 9dee52ad61..867329582c 100644 --- a/src/tests/eolian/data/typedef_ref_stub.c +++ b/src/tests/eolian/data/typedef_ref_stub.h @@ -1,5 +1,5 @@ -#ifndef _EOLIAN_TYPEDEF_STUB_H_STUBS -#define _EOLIAN_TYPEDEF_STUB_H_STUBS +#ifndef _EOLIAN_TYPEDEF_EO_STUB_H_STUBS +#define _EOLIAN_TYPEDEF_EO_STUB_H_STUBS typedef Eo Typedef; diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c index d1d06169e4..c339b2911f 100644 --- a/src/tests/eolian/eolian_generation.c +++ b/src/tests/eolian/eolian_generation.c @@ -111,17 +111,17 @@ START_TEST(eolian_types_generation) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_typedef", eina_environment_tmp_get()); - _remove_ref(output_filepath, "h"); - _remove_ref(output_filepath, "stub.h"); + _remove_ref(output_filepath, "eo.h"); + _remove_ref(output_filepath, "eo.stub.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/typedef.eo", "-gh", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/typedef_ref.c", output_filepath, "h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/typedef_ref.h", output_filepath, "eo.h")); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/struct.eo", "-gh", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/struct_ref.c", output_filepath, "h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/struct_ref.h", output_filepath, "eo.h")); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/typedef.eo", "-gs", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/typedef_ref_stub.c", output_filepath, "stub.h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/typedef_ref_stub.h", output_filepath, "eo.stub.h")); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/struct.eo", "-gs", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/struct_ref_stub.c", output_filepath, "stub.h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/struct_ref_stub.h", output_filepath, "eo.stub.h")); } END_TEST @@ -130,9 +130,9 @@ START_TEST(eolian_default_values_generation) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_class_simple", eina_environment_tmp_get()); - _remove_ref(output_filepath, "c"); + _remove_ref(output_filepath, "eo.c"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/class_simple.eo", "-gc", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref.c", output_filepath, "c")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref.c", output_filepath, "eo.c")); } END_TEST @@ -141,9 +141,9 @@ START_TEST(eolian_override_generation) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_override", eina_environment_tmp_get()); - _remove_ref(output_filepath, "c"); + _remove_ref(output_filepath, "eo.c"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/override.eo", "-gc", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/override_ref.c", output_filepath, "c")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/override_ref.c", output_filepath, "eo.c")); } END_TEST @@ -152,12 +152,12 @@ START_TEST(eolian_functions_descriptions) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_class_simple", eina_environment_tmp_get()); - _remove_ref(output_filepath, "h"); + _remove_ref(output_filepath, "eo.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/class_simple.eo", "-gh", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref_eo.h", output_filepath, "h")); - _remove_ref(output_filepath, "legacy.h"); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref_eo.h", output_filepath, "eo.h")); + _remove_ref(output_filepath, "eo.legacy.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/class_simple.eo", "-gl", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref_legacy.h", output_filepath, "legacy.h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/class_simple_ref_legacy.h", output_filepath, "eo.legacy.h")); } END_TEST @@ -166,9 +166,9 @@ START_TEST(eolian_import) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_import_types", eina_environment_tmp_get()); - _remove_ref(output_filepath, "h"); + _remove_ref(output_filepath, "eot.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/import_types.eot", "-gh", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/import_types_ref.h", output_filepath, "h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/import_types_ref.h", output_filepath, "eot.h")); } END_TEST @@ -177,12 +177,12 @@ START_TEST(eolian_docs) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_docs", eina_environment_tmp_get()); - _remove_ref(output_filepath, "h"); + _remove_ref(output_filepath, "eo.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/docs.eo", "-gh", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/docs_ref.h", output_filepath, "h")); - _remove_ref(output_filepath, "legacy.h"); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/docs_ref.h", output_filepath, "eo.h")); + _remove_ref(output_filepath, "eo.legacy.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/docs.eo", "-gl", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/docs_ref_legacy.h", output_filepath, "legacy.h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/docs_ref_legacy.h", output_filepath, "eo.legacy.h")); } END_TEST @@ -193,19 +193,19 @@ START_TEST(eolian_function_pointers) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_function_pointers", eina_environment_tmp_get()); - _remove_ref(output_filepath, "h"); + _remove_ref(output_filepath, "eot.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_types.eot", "-gh", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_types_ref.h", output_filepath, "h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_types_ref.h", output_filepath, "eot.h")); // .eo.h - _remove_ref(output_filepath, "h"); + _remove_ref(output_filepath, "eo.h"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_as_argument.eo", "-gh", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_ref.h", output_filepath, "h")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_ref.h", output_filepath, "eo.h")); // .eo.c - _remove_ref(output_filepath, "c"); + _remove_ref(output_filepath, "eo.c"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/function_as_argument.eo", "-gc", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_ref.c", output_filepath, "c")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/function_as_argument_ref.c", output_filepath, "eo.c")); // .eo.imp.c _remove_ref(output_filepath, "c"); @@ -222,9 +222,9 @@ START_TEST(owning) char output_filepath[PATH_MAX] = ""; snprintf(output_filepath, PATH_MAX, "%s/eolian_owning", eina_environment_tmp_get()); - _remove_ref(output_filepath, "c"); + _remove_ref(output_filepath, "eo.c"); fail_if(0 != _eolian_gen_execute(PACKAGE_DATA_DIR"/data/owning.eo", "-gc", output_filepath)); - fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/owning.eo.c", output_filepath, "c")); + fail_if(!_files_compare(PACKAGE_DATA_DIR"/data/owning.eo.c", output_filepath, "eo.c")); } END_TEST --
