(t): Factor out .in suffix.

Include new test: t16a.

2 files changed, 20 insertions, 24 deletions

diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index a5d65cc05..80fc45b24 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -3,20 +3,17 @@
 AUTOMAKE_OPTIONS = 1.1
 
 x = sort
-in = \
-  t01a.in t02a.in t02b.in t02c.in t02d.in t02e.in t02f.in t03a.in \
-  t03b.in t03c.in t03d.in t03e.in t03f.in t03g.in t03h.in t03i.in \
-  t04a.in t04b.in t04c.in t04d.in t04e.in t05a.in t05b.in t05c.in \
-  t05d.in t05e.in t05f.in t06a.in t06b.in t06c.in t06d.in t06e.in \
-  t06f.in t07a.in t07b.in t07c.in t07d.in t08a.in t08b.in t09a.in \
-  t09b.in t09c.in t09d.in t10a.in t10a0.in t10a1.in t10a2.in t10b.in \
-  t10c.in t10d.in t10e.in t10f.in t10g.in t11a.in t11b.in t11c.in \
-  t11d.in t12a.in t12b.in t12c.in t12d.in t13a.in t13b.in t14a.in \
-  t14b.in t15a.in t15b.in t15c.in t15d.in t15e.in
-
-exp = $(in:.in=.exp)
-out = $(in:.in=.out)
-err = $(in:.in=.err)
+t = \
+  t01a t02a t02b t02c t02d t02e t02f t03a t03b t03c t03d t03e t03f t03g \
+  t03h t03i t04a t04b t04c t04d t04e t05a t05b t05c t05d t05e t05f t06a t06b \
+  t06c t06d t06e t06f t07a t07b t07c t07d t08a t08b t09a t09b t09c t09d t10a \
+  t10a0 t10a1 t10a2 t10b t10c t10d t10e t10f t10g t11a t11b t11c t11d t12a \
+  t12b t12c t12d t13a t13b t14a t14b t15a t15b t15c t15d t15e t16a
+
+in = $(t:=.in)
+exp = $(t:=.exp)
+out = $(t:=.out)
+err = $(t:=.err)
 
 EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index 7b1b8d46e..0740d81ef 100644
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -3,16 +3,15 @@
 AUTOMAKE_OPTIONS = 1.1c
 
 x = tr
-in = \
-  t1.in t2.in t3.in t4.in t5.in t6.in t7.in t8.in t9.in tA.in tB.in \
-  tC.in tD.in tE.in tF.in tG.in tH.in tI.in tR0.0.in tR0.1.in tR1.0.in \
-  tR1.1.in tR2.in tR3.in tR4.in tR5.in tR6.in ta.in tb.in tc.in td.in \
-  te.in tf.in tg.in th.in ti.in tj.in tk.in tl.in tm.in tn.in to.in \
-  tp.in tq.in tr.in ts.in tt.in tu.in tv.in tw.in tx.in ty.in tz.in
-
-exp = $(in:.in=.exp)
-out = $(in:.in=.out)
-err = $(in:.in=.err)
+t = \
+  t1 t2 t3 t4 t5 t6 t7 t8 t9 tA tB tC tD tE tF tG tH tI tR0.0 tR0.1 tR1.0 \
+  tR1.1 tR2 tR3 tR4 tR5 tR6 ta tb tc td te tf tg th ti tj tk tl tm tn to \
+  tp tq tr ts tt tu tv tw tx ty tz
+
+in = $(t:=.in)
+exp = $(t:=.exp)
+out = $(t:=.out)
+err = $(t:=.err)
 
 EXTRA_DIST = build-script.pl Test.pm $x-tests $(in) $(exp)
 noinst_SCRIPTS = $x-tests