error trap for testing, 4th

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=442

texlive.spec

@@ -4302,7 +4302,7 @@ popd
 	PATH=$prefix/bin:$PATH			\
 	TEXMFLOCAL=%{_texmfmaindir}		\
 	TEXMFCNF=$texmfcnf			\
-
+    (
         testsuite () {
             test -s ${world}/bibtex-x/test-suite.log || return
             cat ${world}/bibtex-x/test-suite.log
@@ -4315,9 +4315,8 @@ popd
         trap "testsuite" ERR
 
 	make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true
+    )
 
-        trap 'rm -vf %{options}' ERR
-        unset testsuite
     popd
 
     pushd utils/asymptote