aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2015-10-11 17:23:09 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2015-10-11 17:23:09 +0300
commitff10573b3858b3eebb4d546fa4a2929d0b34df69 (patch)
treead14077519556fdae2f06e7e43587db2d37dd798
parentfb4533a10ff7ad537ed6c969583ed6a326df6b17 (diff)
downloadm4kwargs-ff10573b3858b3eebb4d546fa4a2929d0b34df69.tar.gz
m4kwargs-ff10573b3858b3eebb4d546fa4a2929d0b34df69.tar.bz2
Redo testsuite
-rw-r--r--t/Makefile42
-rw-r--r--t/asgn.m49
-rw-r--r--t/asgn.t25
-rw-r--r--t/asgn.txt3
-rw-r--r--t/asgnopts.m415
-rw-r--r--t/asgnopts.t37
-rw-r--r--t/asgnopts.txt11
-rw-r--r--t/clear.m424
-rw-r--r--t/clear.t56
-rw-r--r--t/clear.txt19
-rw-r--r--t/dump.m412
-rw-r--r--t/dump.t32
-rw-r--r--t/dump.txt5
-rw-r--r--t/dumpval.m412
-rw-r--r--t/dumpval.t34
-rw-r--r--t/dumpval.txt9
-rw-r--r--t/foreach.m410
-rw-r--r--t/foreach.t30
-rw-r--r--t/foreach.txt5
-rw-r--r--t/ifempty.m411
-rw-r--r--t/ifempty.t30
-rw-r--r--t/ifempty.txt4
-rw-r--r--t/listrem00.m411
-rw-r--r--t/listrem00.t29
-rw-r--r--t/listrem00.txt5
-rw-r--r--t/listrem01.m416
-rw-r--r--t/listrem01.t34
-rw-r--r--t/listrem01.txt5
-rw-r--r--t/mangle.m49
-rw-r--r--t/mangle.t26
-rw-r--r--t/mangle.txt4
-rw-r--r--t/namelist.m412
-rw-r--r--t/namelist.t31
-rw-r--r--t/namelist.txt6
-rw-r--r--t/null.m47
-rw-r--r--t/null.t24
-rw-r--r--t/null.txt3
-rw-r--r--t/ovr.m415
-rw-r--r--t/ovr.t35
-rw-r--r--t/ovr.txt7
-rw-r--r--t/ovropts.m422
-rw-r--r--t/ovropts.t51
-rw-r--r--t/ovropts.txt16
-rw-r--r--t/popopts.m419
-rw-r--r--t/popopts.t46
-rw-r--r--t/popopts.txt16
-rw-r--r--t/pushopts.m427
-rw-r--r--t/pushopts.t58
-rw-r--r--t/pushopts.txt20
-rwxr-xr-xt/runtest.sh37
-rw-r--r--t/set.m414
-rw-r--r--t/set.t36
-rw-r--r--t/set.txt9
-rw-r--r--t/unasgn.m412
-rw-r--r--t/unasgn.t30
-rw-r--r--t/unasgn.txt5
-rw-r--r--t/unasgnopts.m422
-rw-r--r--t/unasgnopts.t52
-rw-r--r--t/unasgnopts.txt17
-rw-r--r--t/val.m415
-rw-r--r--t/val.t38
-rw-r--r--t/val.txt10
-rw-r--r--t/withopts.m410
-rw-r--r--t/withopts.t31
-rw-r--r--t/withopts.txt8
65 files changed, 814 insertions, 521 deletions
diff --git a/t/Makefile b/t/Makefile
index 781d5dd..7302389 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -1,25 +1,25 @@
TESTCASES=\
- namelist.m4\
- ifempty.m4\
- listrem00.m4\
- listrem01.m4\
- foreach.m4\
- mangle.m4\
- null.m4\
- dump.m4\
- set.m4\
- ovr.m4\
- val.m4\
- dumpval.m4\
- clear.m4\
- asgn.m4\
- unasgn.m4\
- asgnopts.m4\
- ovropts.m4\
- unasgnopts.m4\
- pushopts.m4\
- popopts.m4\
- withopts.m4
+ namelist.t\
+ ifempty.t\
+ listrem00.t\
+ listrem01.t\
+ foreach.t\
+ mangle.t\
+ null.t\
+ dump.t\
+ set.t\
+ ovr.t\
+ val.t\
+ dumpval.t\
+ clear.t\
+ asgn.t\
+ unasgn.t\
+ asgnopts.t\
+ ovropts.t\
+ unasgnopts.t\
+ pushopts.t\
+ popopts.t\
+ withopts.t
M4FLAGS=-I../m4
diff --git a/t/asgn.m4 b/t/asgn.m4
deleted file mode 100644
index cc482ee..0000000
--- a/t/asgn.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_divert(0)m4_dnl
-# BEGIN
-M4OPT_ASGN(`bar=baz')m4_dnl
-M4OPT_VAL(`bar')
-# END
diff --git a/t/asgn.t b/t/asgn.t
new file mode 100644
index 0000000..38ad09e
--- /dev/null
+++ b/t/asgn.t
@@ -0,0 +1,25 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+# BEGIN
+M4OPT_ASGN(`bar=baz')m4_dnl
+M4OPT_VAL(`bar')
+# END
+!OUT
+# BEGIN
+baz
+# END
+!END \ No newline at end of file
diff --git a/t/asgn.txt b/t/asgn.txt
deleted file mode 100644
index 61103b3..0000000
--- a/t/asgn.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# BEGIN
-baz
-# END
diff --git a/t/asgnopts.m4 b/t/asgnopts.m4
deleted file mode 100644
index d49a042..0000000
--- a/t/asgnopts.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_divert(0)m4_dnl
-# BEGIN
-M4OPTS_ASGN(`foo=qux',`bar=baz',`baz=foo,bar')m4_dnl
-# RAW
-m4_defn(`_GR_OPTION_foo')
-m4_defn(`_GR_OPTION_bar')
-m4_defn(`_GR_OPTION_baz')
-# DUMP
-M4OPTS_DUMP()
-# END
-
diff --git a/t/asgnopts.t b/t/asgnopts.t
new file mode 100644
index 0000000..7f755bc
--- /dev/null
+++ b/t/asgnopts.t
@@ -0,0 +1,37 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+# BEGIN
+M4OPTS_ASGN(`foo=qux',`bar=baz',`baz=foo,bar')m4_dnl
+# RAW
+m4_defn(`_GR_OPTION_foo')
+m4_defn(`_GR_OPTION_bar')
+m4_defn(`_GR_OPTION_baz')
+# DUMP
+M4OPTS_DUMP()
+# END
+!OUT
+# BEGIN
+# RAW
+qux
+baz
+foo,bar
+# DUMP
+foo=qux
+bar=baz
+baz=foo,bar
+# END
+!END
diff --git a/t/asgnopts.txt b/t/asgnopts.txt
deleted file mode 100644
index 9732cd6..0000000
--- a/t/asgnopts.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# BEGIN
-# RAW
-qux
-baz
-foo,bar
-# DUMP
-foo=qux
-bar=baz
-baz=foo,bar
-# END
-
diff --git a/t/clear.m4 b/t/clear.m4
deleted file mode 100644
index 83b5679..0000000
--- a/t/clear.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_divert(0)m4_dnl
-# BEGIN
-M4OPT_SET(`foo',314)
-M4OPT_SET(`bar',`q1')
-M4OPT_SET(`baz-bar',`shmeer')
-# DUMP
-M4OPTS_DUMP()
-# CLEAR bar
-M4OPT_CLR(`bar')m4_dnl
-M4OPTS_DUMP()
-# CLEAR bar 2
-M4OPT_CLR(`bar')m4_dnl
-M4OPTS_DUMP()
-# CLEAR baz-bar
-M4OPT_CLR(`baz-bar')m4_dnl
-M4OPTS_DUMP()
-# CLEAR foo
-M4OPT_CLR(`foo')m4_dnl
-M4OPTS_DUMP()
-# END
diff --git a/t/clear.t b/t/clear.t
new file mode 100644
index 0000000..e13f9af
--- /dev/null
+++ b/t/clear.t
@@ -0,0 +1,56 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+# BEGIN
+M4OPT_SET(`foo',314)
+M4OPT_SET(`bar',`q1')
+M4OPT_SET(`baz-bar',`shmeer')
+# DUMP
+M4OPTS_DUMP()
+# CLEAR bar
+M4OPT_CLR(`bar')m4_dnl
+M4OPTS_DUMP()
+# CLEAR bar 2
+M4OPT_CLR(`bar')m4_dnl
+M4OPTS_DUMP()
+# CLEAR baz-bar
+M4OPT_CLR(`baz-bar')m4_dnl
+M4OPTS_DUMP()
+# CLEAR foo
+M4OPT_CLR(`foo')m4_dnl
+M4OPTS_DUMP()
+# END
+!OUT
+# BEGIN
+
+
+
+# DUMP
+foo=314
+bar=q1
+baz-bar=shmeer
+# CLEAR bar
+foo=314
+baz-bar=shmeer
+# CLEAR bar 2
+foo=314
+baz-bar=shmeer
+# CLEAR baz-bar
+foo=314
+# CLEAR foo
+
+# END
+!END
diff --git a/t/clear.txt b/t/clear.txt
deleted file mode 100644
index 1775614..0000000
--- a/t/clear.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# BEGIN
-
-
-
-# DUMP
-foo=314
-bar=q1
-baz-bar=shmeer
-# CLEAR bar
-foo=314
-baz-bar=shmeer
-# CLEAR bar 2
-foo=314
-baz-bar=shmeer
-# CLEAR baz-bar
-foo=314
-# CLEAR foo
-
-# END
diff --git a/t/dump.m4 b/t/dump.m4
deleted file mode 100644
index 7dc221f..0000000
--- a/t/dump.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_define(`_m4opt_list',``foo',`bar',`baz'')m4_dnl
-m4_pushdef(`_GR_OPTION_foo',`1')
-m4_pushdef(`_GR_OPTION_bar',`Bar')
-m4_pushdef(`_GR_OPTION_baz',`Baz qux')
-m4_divert(0)m4_dnl
-// BEGIN
-M4OPTS_DUMP(`// ')
-// END
diff --git a/t/dump.t b/t/dump.t
new file mode 100644
index 0000000..b23e7f9
--- /dev/null
+++ b/t/dump.t
@@ -0,0 +1,32 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+m4_divert(-1)
+m4_define(`_m4opt_list',``foo',`bar',`baz'')m4_dnl
+m4_pushdef(`_GR_OPTION_foo',`1')
+m4_pushdef(`_GR_OPTION_bar',`Bar')
+m4_pushdef(`_GR_OPTION_baz',`Baz qux')
+m4_divert(0)m4_dnl
+// BEGIN
+M4OPTS_DUMP(`// ')
+// END
+!OUT
+// BEGIN
+// foo=1
+// bar=Bar
+// baz=Baz qux
+// END
+!END
diff --git a/t/dump.txt b/t/dump.txt
deleted file mode 100644
index 5c26c22..0000000
--- a/t/dump.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// BEGIN
-// foo=1
-// bar=Bar
-// baz=Baz qux
-// END
diff --git a/t/dumpval.m4 b/t/dumpval.m4
deleted file mode 100644
index abdc532..0000000
--- a/t/dumpval.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_divert(0)m4_dnl
-# BEGIN
-M4OPT_SET(`foo',314)
-M4OPT_SET(`bar',`q1')
-M4OPT_SET(`baz-bar',`shmeer')
-# DUMP
-M4OPTS_DUMP()
-# END
diff --git a/t/dumpval.t b/t/dumpval.t
new file mode 100644
index 0000000..1669167
--- /dev/null
+++ b/t/dumpval.t
@@ -0,0 +1,34 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+# BEGIN
+M4OPT_SET(`foo',314)
+M4OPT_SET(`bar',`q1')
+M4OPT_SET(`baz-bar',`shmeer')
+# DUMP
+M4OPTS_DUMP()
+# END
+!OUT
+# BEGIN
+
+
+
+# DUMP
+foo=314
+bar=q1
+baz-bar=shmeer
+# END
+!END
diff --git a/t/dumpval.txt b/t/dumpval.txt
deleted file mode 100644
index 86f5bc1..0000000
--- a/t/dumpval.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# BEGIN
-
-
-
-# DUMP
-foo=314
-bar=q1
-baz-bar=shmeer
-# END
diff --git a/t/foreach.m4 b/t/foreach.m4
deleted file mode 100644
index 67a19b2..0000000
--- a/t/foreach.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_define(`list',``foo',`bar',`baz'')
-m4_divert(0)m4_dnl
-# BEGIN
-m4_foreach(`opt',m4_quote_names(list),`opt
-')m4_dnl
-# END
diff --git a/t/foreach.t b/t/foreach.t
new file mode 100644
index 0000000..15fe8ec
--- /dev/null
+++ b/t/foreach.t
@@ -0,0 +1,30 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+m4_divert(-1)
+m4_define(`list',``foo',`bar',`baz'')
+m4_divert(0)m4_dnl
+# BEGIN
+m4_foreach(`opt',m4_quote_names(list),`opt
+')m4_dnl
+# END
+!OUT
+# BEGIN
+foo
+bar
+baz
+# END
+!END
diff --git a/t/foreach.txt b/t/foreach.txt
deleted file mode 100644
index 75ea6a9..0000000
--- a/t/foreach.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# BEGIN
-foo
-bar
-baz
-# END
diff --git a/t/ifempty.m4 b/t/ifempty.m4
deleted file mode 100644
index e9b52ea..0000000
--- a/t/ifempty.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_define(`null')
-m4_define(`list',``foo',`bar',`baz'')
-m4_divert(0)m4_dnl
-# BEGIN
-`null' m4_ifempty(null,T,NIL)
-`list' m4_ifempty(m4_quote(list),T,NIL)
-# END
diff --git a/t/ifempty.t b/t/ifempty.t
new file mode 100644
index 0000000..6a0a8aa
--- /dev/null
+++ b/t/ifempty.t
@@ -0,0 +1,30 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+m4_divert(-1)
+m4_define(`null')
+m4_define(`list',``foo',`bar',`baz'')
+m4_divert(0)m4_dnl
+# BEGIN
+`null' m4_ifempty(null,T,NIL)
+`list' m4_ifempty(m4_quote(list),T,NIL)
+# END
+!OUT
+# BEGIN
+null T
+list NIL
+# END
+!END
diff --git a/t/ifempty.txt b/t/ifempty.txt
deleted file mode 100644
index 35a610e..0000000
--- a/t/ifempty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# BEGIN
-null T
-list NIL
-# END
diff --git a/t/listrem00.m4 b/t/listrem00.m4
deleted file mode 100644
index 13d93ae..0000000
--- a/t/listrem00.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_define(`list',``foo',`bar',`baz'')
-m4_divert(0)m4_dnl
-# BEGIN
-m4opt_list_remove_(`foo',list)
-m4opt_list_remove_(`bar',list)
-m4opt_list_remove_(`baz',list)
-# END
diff --git a/t/listrem00.t b/t/listrem00.t
new file mode 100644
index 0000000..55abc30
--- /dev/null
+++ b/t/listrem00.t
@@ -0,0 +1,29 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+m4_define(`list',``foo',`bar',`baz'')m4_dnl
+# BEGIN
+m4opt_list_remove_(`foo',list)
+m4opt_list_remove_(`bar',list)
+m4opt_list_remove_(`baz',list)
+# END
+!OUT
+# BEGIN
+,bar,baz
+,foo,baz
+,foo,bar
+# END
+!END
diff --git a/t/listrem00.txt b/t/listrem00.txt
deleted file mode 100644
index 4c19a38..0000000
--- a/t/listrem00.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# BEGIN
-,bar,baz
-,foo,baz
-,foo,bar
-# END
diff --git a/t/listrem01.m4 b/t/listrem01.m4
deleted file mode 100644
index 0fb9d37..0000000
--- a/t/listrem01.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-divert(-1)dnl
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_divert(0)m4_dnl
-# BEGIN
-m4_define(`list',``foo',`bar',`baz'')m4_dnl
-m4opt_list_remove(`list',`foo')m4_dnl
-: list
-m4_define(`list',``foo',`bar',`baz'')m4_dnl
-m4opt_list_remove(`list',`bar')m4_dnl
-: list
-m4_define(`list',``foo',`bar',`baz'')m4_dnl
-m4opt_list_remove(`list',`baz')m4_dnl
-: list
-# END
diff --git a/t/listrem01.t b/t/listrem01.t
new file mode 100644
index 0000000..55db39f
--- /dev/null
+++ b/t/listrem01.t
@@ -0,0 +1,34 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+# BEGIN
+m4_define(`list',``foo',`bar',`baz'')m4_dnl
+m4opt_list_remove(`list',`foo')m4_dnl
+: list
+m4_define(`list',``foo',`bar',`baz'')m4_dnl
+m4opt_list_remove(`list',`bar')m4_dnl
+: list
+m4_define(`list',``foo',`bar',`baz'')m4_dnl
+m4opt_list_remove(`list',`baz')m4_dnl
+: list
+# END
+!OUT
+# BEGIN
+: bar,baz
+: foo,baz
+: foo,bar
+# END
+!END
diff --git a/t/listrem01.txt b/t/listrem01.txt
deleted file mode 100644
index d789d82..0000000
--- a/t/listrem01.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# BEGIN
-: bar,baz
-: foo,baz
-: foo,bar
-# END
diff --git a/t/mangle.m4 b/t/mangle.m4
deleted file mode 100644
index fb33883..0000000
--- a/t/mangle.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-divert(-1)
-include(prefix.m4)
-m4_include(opt.m4)
-m4_include(metasyn.m4)
-m4_divert(0)m4_dnl
-# BEGIN
-m4opt_mangle_option(`foo')
-m4opt_mangle_option(`foo-bar:baz,qux,.45')
-# END
diff --git a/t/mangle.t b/t/mangle.t
new file mode 100644
index 0000000..2d3a1d2
--- /dev/null
+++ b/t/mangle.t
@@ -0,0 +1,26 @@
+!C This file is part of M4OPT
+!C Copyright (C) 2015 Sergey Poznyakoff
+!C
+!C M4OPT is free software; you can redistribute it and/or modify
+!C it under the terms of the GNU General Public License as published by
+!C the Free Software Foundation; either version 3, or (at your option)
+!C any later version.
+!C
+!C M4OPT is distributed in the hope that it will be useful,
+!C but WITHOUT ANY WARRANTY; without even the implied warranty of
+!C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+!C GNU General Public License for more details.
+!C
+!C You should have received a copy of the GNU General Public License
+!C along with M4OPT. If not, see <http://www.gnu.org/licenses/>.
+!IN
+# BEGIN
+m4opt_mangle_option(`foo')
+m4opt_mangle_option(`foo-bar:baz,qux,.45')
+# END
+!OUT
+# BEGIN