From 9ac8400684b12e919c929d585a6ae32c0554f7af Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Sat, 9 May 2020 05:22:51 +0200 Subject: make: remove whitespaces from default atom template --- src/blogc-make/atom.c | 4 +- tests/blogc-make/check_atom.c | 32 ++++++++-------- tests/blogc-make/check_blogc_make.sh.in | 66 ++------------------------------- 3 files changed, 22 insertions(+), 80 deletions(-) diff --git a/src/blogc-make/atom.c b/src/blogc-make/atom.c index 6749658..0f86e1c 100644 --- a/src/blogc-make/atom.c +++ b/src/blogc-make/atom.c @@ -30,7 +30,7 @@ static const char atom_template[] = " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {%% block listing %%}\n" + " {%%- block listing %%}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}%s\n" @@ -43,7 +43,7 @@ static const char atom_template[] = " \n" " \n" " \n" - " {%% endblock %%}\n" + " {%%- endblock %%}\n" "\n"; diff --git a/tests/blogc-make/check_atom.c b/tests/blogc-make/check_atom.c index 94c9a37..b35746b 100644 --- a/tests/blogc-make/check_atom.c +++ b/tests/blogc-make/check_atom.c @@ -51,7 +51,7 @@ test_atom_generate_empty_file(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}.html\n" @@ -64,7 +64,7 @@ test_atom_generate_empty_file(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); @@ -103,7 +103,7 @@ test_atom_generate_empty_dir(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}/index.html\n" @@ -116,7 +116,7 @@ test_atom_generate_empty_dir(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); @@ -155,7 +155,7 @@ test_atom_generate_file(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}.html\n" @@ -168,7 +168,7 @@ test_atom_generate_file(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); @@ -207,7 +207,7 @@ test_atom_generate_dir(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/index.html\n" @@ -220,7 +220,7 @@ test_atom_generate_dir(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); @@ -267,7 +267,7 @@ test_atom_empty_file(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}.html\n" @@ -280,7 +280,7 @@ test_atom_empty_file(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); @@ -329,7 +329,7 @@ test_atom_empty_dir(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}/index.html\n" @@ -342,7 +342,7 @@ test_atom_empty_dir(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); @@ -391,7 +391,7 @@ test_atom_file(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}.html\n" @@ -404,7 +404,7 @@ test_atom_file(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); @@ -453,7 +453,7 @@ test_atom_dir(void **state) " {{ AUTHOR_EMAIL }}\n" " \n" " {{ SITE_TAGLINE }}\n" - " {% block listing %}\n" + " {%- block listing %}\n" " \n" " {{ TITLE }}\n" " {{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/index.html\n" @@ -466,7 +466,7 @@ test_atom_dir(void **state) " \n" " \n" " \n" - " {% endblock %}\n" + " {%- endblock %}\n" "\n"); free(cmp); diff --git a/tests/blogc-make/check_blogc_make.sh.in b/tests/blogc-make/check_blogc_make.sh.in index 423b83e..73393d4 100755 --- a/tests/blogc-make/check_blogc_make.sh.in +++ b/tests/blogc-make/check_blogc_make.sh.in @@ -112,7 +112,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Bar http://example.org/post/bar/index.html @@ -126,7 +125,6 @@ cat > "${TEMP}/expected-atom.xml" <This is bar.

]]>
- Foo http://example.org/post/foo/index.html @@ -140,7 +138,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" @@ -256,7 +253,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Post 11 http://example.org/post/post11/index.html @@ -270,7 +266,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 11.

]]>
- Post 10 http://example.org/post/post10/index.html @@ -284,7 +279,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 10.

]]>
- Post 09 http://example.org/post/post09/index.html @@ -298,7 +292,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 09.

]]>
- Post 08 http://example.org/post/post08/index.html @@ -312,7 +305,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 08.

]]>
- Post 07 http://example.org/post/post07/index.html @@ -326,7 +318,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 07.

]]>
- Post 06 http://example.org/post/post06/index.html @@ -340,7 +331,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 06.

]]>
- Post 05 http://example.org/post/post05/index.html @@ -354,7 +344,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 05.

]]>
- Post 04 http://example.org/post/post04/index.html @@ -368,7 +357,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 04.

]]>
- Post 03 http://example.org/post/post03/index.html @@ -382,7 +370,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 03.

]]>
- Post 02 http://example.org/post/post02/index.html @@ -396,7 +383,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 02.

]]>
- Post 01 http://example.org/post/post01/index.html @@ -410,7 +396,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 01.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" @@ -482,7 +467,7 @@ cat > "${TEMP}/proj/templates/atom.tmpl" <{{ AUTHOR_EMAIL }} {{ SITE_TAGLINE }} - {% block listing %} + {%- block listing %} {{ TITLE }} {{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/ @@ -495,7 +480,7 @@ cat > "${TEMP}/proj/templates/atom.tmpl" < - {% endblock %} + {%- endblock %} EOF @@ -529,7 +514,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Post 11 http://example.org/post/post11/ @@ -543,7 +527,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 11.

]]>
- Post 10 http://example.org/post/post10/ @@ -557,7 +540,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 10.

]]>
- Post 09 http://example.org/post/post09/ @@ -571,7 +553,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 09.

]]>
- Post 08 http://example.org/post/post08/ @@ -585,7 +566,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 08.

]]>
- Post 07 http://example.org/post/post07/ @@ -599,7 +579,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 07.

]]>
- Post 06 http://example.org/post/post06/ @@ -613,7 +592,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 06.

]]>
- Post 05 http://example.org/post/post05/ @@ -627,7 +605,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 05.

]]>
- Post 04 http://example.org/post/post04/ @@ -641,7 +618,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 04.

]]>
- Post 03 http://example.org/post/post03/ @@ -655,7 +631,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 03.

]]>
- Post 02 http://example.org/post/post02/ @@ -669,7 +644,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 02.

]]>
- Post 01 http://example.org/post/post01/ @@ -683,7 +657,6 @@ cat > "${TEMP}/expected-atom.xml" <This is Post 01.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" @@ -932,7 +905,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Bar http://example.org/post/bar/index.html @@ -946,7 +918,6 @@ cat > "${TEMP}/expected-atom.xml" <This is bar.

]]>
- Foo http://example.org/post/foo/index.html @@ -960,7 +931,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" @@ -1042,7 +1012,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Foo http://example.org/post/foo/index.html @@ -1056,7 +1025,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- Bar http://example.org/post/bar/index.html @@ -1070,7 +1038,6 @@ cat > "${TEMP}/expected-atom.xml" <This is bar.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" @@ -1161,7 +1128,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Foo http://example.org/post/foo/index.html @@ -1175,7 +1141,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- Bar http://example.org/post/bar/index.html @@ -1189,7 +1154,6 @@ cat > "${TEMP}/expected-atom.xml" <This is bar.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" @@ -1282,7 +1246,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Foo http://example.org/post/foo/index.html @@ -1296,7 +1259,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- Bar http://example.org/post/bar/index.html @@ -1310,7 +1272,6 @@ cat > "${TEMP}/expected-atom.xml" <This is bar.

]]>
- Baz http://example.org/post/baz/index.html @@ -1324,7 +1285,6 @@ cat > "${TEMP}/expected-atom.xml" <This is baz.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom.xml" "${TEMP}/expected-atom.xml" @@ -1342,7 +1302,6 @@ cat > "${TEMP}/expected-atom-tag1.xml" <author@example.com WAT?! - Baz http://example.org/post/baz/index.html @@ -1356,7 +1315,6 @@ cat > "${TEMP}/expected-atom-tag1.xml" <This is baz.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom/tag1.xml" "${TEMP}/expected-atom-tag1.xml" @@ -1374,7 +1332,6 @@ cat > "${TEMP}/expected-atom-tag2.xml" <author@example.com WAT?! - Baz http://example.org/post/baz/index.html @@ -1388,7 +1345,6 @@ cat > "${TEMP}/expected-atom-tag2.xml" <This is baz.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atom/tag2.xml" "${TEMP}/expected-atom-tag2.xml" @@ -1613,7 +1569,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Foo http://example.org/poost/foo.html @@ -1627,7 +1582,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atoom/index.xml" "${TEMP}/expected-atom.xml" @@ -1722,7 +1676,6 @@ cat > "${TEMP}/expected-atom-tag1.xml" <author@example.com WAT?! - Baz http://example.org/poost/baz.html @@ -1736,7 +1689,6 @@ cat > "${TEMP}/expected-atom-tag1.xml" <This is baz.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atoom/tag1/index.xml" "${TEMP}/expected-atom-tag1.xml" @@ -1754,7 +1706,6 @@ cat > "${TEMP}/expected-atom-tag2.xml" <author@example.com WAT?! - Baz http://example.org/poost/baz.html @@ -1768,7 +1719,6 @@ cat > "${TEMP}/expected-atom-tag2.xml" <This is baz.

]]>
- EOF diff -uN "${TEMP}/proj/_build/atoom/tag2/index.xml" "${TEMP}/expected-atom-tag2.xml" @@ -2063,7 +2013,7 @@ cat > "${TEMP}/expected-atom-dump.xml" <{{ AUTHOR_EMAIL }} {{ SITE_TAGLINE }} - {% block listing %} + {%- block listing %} {{ TITLE }} {{ BASE_DOMAIN }}{{ BASE_URL }}/poost/{{ FILENAME }}.html @@ -2076,7 +2026,7 @@ cat > "${TEMP}/expected-atom-dump.xml" < - {% endblock %} + {%- endblock %} EOF diff -uN "${TEMP}/atom.xml" "${TEMP}/expected-atom-dump.xml" @@ -2189,7 +2139,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Foo http://example.org/foo/index.html @@ -2203,7 +2152,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- EOF diff -uN "${TEMP}/proj/_build/index.xml" "${TEMP}/expected-atom.xml" @@ -2326,7 +2274,6 @@ cat > "${TEMP}/expected-atom.xml" <author@example.com WAT?! - Foo http://example.org/foo.html @@ -2340,7 +2287,6 @@ cat > "${TEMP}/expected-atom.xml" <This is foo.

]]>
- EOF diff -uN "${TEMP}/proj/_build/index.xml" "${TEMP}/expected-atom.xml" @@ -2358,7 +2304,6 @@ cat > "${TEMP}/expected-atom-tag1.xml" <author@example.com WAT?! - Baz http://example.org/baz.html @@ -2372,7 +2317,6 @@ cat > "${TEMP}/expected-atom-tag1.xml" <This is baz.

]]>
- EOF diff -uN "${TEMP}/proj/_build/tag1/index.xml" "${TEMP}/expected-atom-tag1.xml" @@ -2390,7 +2334,6 @@ cat > "${TEMP}/expected-atom-tag2.xml" <author@example.com WAT?! - Baz http://example.org/baz.html @@ -2404,7 +2347,6 @@ cat > "${TEMP}/expected-atom-tag2.xml" <This is baz.

]]>
- EOF diff -uN "${TEMP}/proj/_build/tag2/index.xml" "${TEMP}/expected-atom-tag2.xml" -- cgit v1.2.3-18-g5258