diff --git a/Makefile.am b/Makefile.am index a150bdd..ae7cf2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,9 +75,7 @@ EXTRA_DIST = pkg.m4 \ tests/lib1/fragment-quoting.pc \ tests/lib1/fragment-quoting-2.pc \ tests/lib1/fragment-quoting-3.pc \ - tests/lib1/fragment-quoting-4.pc \ tests/lib1/fragment-quoting-5.pc \ - tests/lib1/fragment-quoting-6.pc \ tests/lib1/fragment-quoting-7.pc \ tests/lib1/malformed-1.pc \ tests/lib1/malformed-quoting.pc \ diff --git a/tests/lib1/fragment-quoting-4.pc b/tests/lib1/fragment-quoting-4.pc deleted file mode 100644 index f35e0ed..0000000 --- a/tests/lib1/fragment-quoting-4.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/test -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: fragment-quoting-4 -Description: A testing pkg-config file -Version: 1.2.3 -Cflags: -fPIC -I${includedir}/foo -DQUOTED="'${prefix}/share/doc'" -Cflags.private: -DFOO_STATIC diff --git a/tests/lib1/fragment-quoting-6.pc b/tests/lib1/fragment-quoting-6.pc deleted file mode 100644 index 191acd9..0000000 --- a/tests/lib1/fragment-quoting-6.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/test -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: fragment-quoting-6 -Description: A testing pkg-config file -Version: 1.2.3 -Cflags: -fPIC -I${includedir}/foo -DQUOTED=\'${prefix}/share/doc\' -Cflags.private: -DFOO_STATIC diff --git a/tests/parser.sh b/tests/parser.sh index 849ef23..5483b55 100755 --- a/tests/parser.sh +++ b/tests/parser.sh @@ -23,9 +23,7 @@ tests_init \ fragment_quoting \ fragment_quoting_2 \ fragment_quoting_3 \ - fragment_quoting_4 \ fragment_quoting_5 \ - fragment_quoting_6 \ fragment_quoting_7 comments_body() @@ -125,7 +123,7 @@ quoted_body() { export PKG_CONFIG_PATH="${selfdir}/lib1" atf_check \ - -o inline:"-DQUOTED=\\\"bla\\\" \n" \ + -o inline:"'-DQUOTED=\"bla\"' \n" \ pkgconf --cflags quotes } @@ -173,7 +171,7 @@ fragment_quoting_body() { export PKG_CONFIG_PATH="${selfdir}/lib1" atf_check \ - -o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\"/test/share/doc\\\" \n" \ + -o inline:"-fPIC -I/test/include/foo '-DQUOTED=\"/test/share/doc\"' \n" \ pkgconf --cflags fragment-quoting } @@ -189,18 +187,10 @@ fragment_quoting_3_body() { export PKG_CONFIG_PATH="${selfdir}/lib1" atf_check \ - -o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\"/test/share/doc\\\" \n" \ + -o inline:"-fPIC -I/test/include/foo '-DQUOTED=\"/test/share/doc\"' \n" \ pkgconf --cflags fragment-quoting-3 } -fragment_quoting_4_body() -{ - export PKG_CONFIG_PATH="${selfdir}/lib1" - atf_check \ - -o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\'/test/share/doc\\\' \n" \ - pkgconf --cflags fragment-quoting-4 -} - fragment_quoting_5_body() { export PKG_CONFIG_PATH="${selfdir}/lib1" @@ -209,14 +199,6 @@ fragment_quoting_5_body() pkgconf --cflags fragment-quoting-5 } -fragment_quoting_6_body() -{ - export PKG_CONFIG_PATH="${selfdir}/lib1" - atf_check \ - -o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\'/test/share/doc\\\' \n" \ - pkgconf --cflags fragment-quoting-6 -} - fragment_quoting_7_body() { export PKG_CONFIG_PATH="${selfdir}/lib1"