[latex3-commits] [l3svn] branch master updated: l3build: Tidy up and fully activate self-testing

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

The following commit(s) were added to refs/heads/master by this push:
       new  7e20440   l3build: Tidy up and fully activate self-testing
7e20440 is described below

commit 7e20440f410e9ab98e99184aef10aaf8d679e590
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Aug 27 08:42:25 2015 +0100

    l3build: Tidy up and fully activate self-testing
    
    Various minor changes folloing pull request #262:
     - Add l3build to top-level check
     - Active tests for l3build
     - Remove stray debug line
     - Update l3build test file to actually work
     - One missing arg. added
    
    With this commit and the ealier integration of the pull request
    itself, this fixes #262.
---
 build.lua                                                 |    2 +-
 l3build/build.lua                                         |    1 -
 l3build/l3build.lua                                       |    3 +--
 l3build/testfiles/{00-test-1.tlg => 00-test-1.luatex.tlg} |   11 ++++-------
 l3build/testfiles/00-test-1.lvt                           |    4 +---
 l3build/testfiles/00-test-1.tlg                           |    7 ++-----
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/build.lua b/build.lua
index 08f5868..73437bb 100644
--- a/build.lua
+++ b/build.lua
@@ -8,7 +8,7 @@ module  = ""
 
 -- A couple of custom variables: the order here is set up for 'importance'
 bundles      = {"l3build", "l3kernel", "l3packages", "l3experimental", "l3trial"}
-checkbundles = {"l3kernel", "l3packages", "l3experimental", "xpackages/xor", "l3trial"}
+checkbundles = {"l3build", "l3kernel", "l3packages", "l3experimental", "xpackages/xor", "l3trial"}
 ctanbundles  = {"l3build", "l3kernel", "l3packages", "l3experimental"}
 
 -- Location of main directory: use Unix-style path separators
diff --git a/l3build/build.lua b/l3build/build.lua
index aae5863..56a22ff 100644
--- a/l3build/build.lua
+++ b/l3build/build.lua
@@ -13,7 +13,6 @@ maindir = ".."
 cleanfiles   = {"*.pdf", "*.tex", "*.zip"}
 installfiles = {"l3build.lua", "regression-test.tex"}
 sourcefiles  = {"*.dtx", "l3build.lua", "*.ins"}
-testfiledir  = ""
 unpackdeps   = { }
 
 -- Load the common build code: this is the one place that a path needs to be
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index 22121f7..891e3f0 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -1197,7 +1197,7 @@ function check(names)
           print("Duplicate test file: " .. i)
           return 1
         else
-          table.insert(stripext(i))
+          table.insert(names, stripext(i))
         end
       end
     end
@@ -1508,7 +1508,6 @@ bundleunpack = bundleunpack or function(sourcedir)
   cleandir(unpackdir)
   for _,i in ipairs(sourcedir or {"."}) do
     for _,j in ipairs(sourcefiles) do
-      print(j, i, unpackdir)
       cp(j, i, unpackdir)
     end
   end
diff --git a/l3build/testfiles/00-test-1.tlg b/l3build/testfiles/00-test-1.luatex.tlg
similarity index 83%
copy from l3build/testfiles/00-test-1.tlg
copy to l3build/testfiles/00-test-1.luatex.tlg
index 1a5dd68..5991d8c 100644
--- a/l3build/testfiles/00-test-1.tlg
+++ b/l3build/testfiles/00-test-1.luatex.tlg
@@ -21,17 +21,14 @@ Main Class: article
 Package: abc
 Options: xyz
 ============================================================
-CFG FILE IS LOADED
-============================================================
-============================================================
 TEST 1: \afterassignment 
 ============================================================
 > hello.
-<argument> ...d}}\foo } \x ={hello} \showthe \foo 
+<argument> ...ef \y {world}}\foo } \x ={hello} \showthe \foo 
 \show \y 
-l.22 }
+l. ...}
 > \y=macro:
 ->world.
-<argument> ... \x ={hello} \showthe \foo \show \y 
-l.22 }
+<argument> ...rld}}\foo } \x ={hello} \showthe \foo \show \y 
+l. ...}
 ============================================================
diff --git a/l3build/testfiles/00-test-1.lvt b/l3build/testfiles/00-test-1.lvt
index e815a80..7b5140f 100644
--- a/l3build/testfiles/00-test-1.lvt
+++ b/l3build/testfiles/00-test-1.lvt
@@ -1,7 +1,6 @@
-
 \input regression-test.tex\relax
 
-\documentclass{article}
+\documentclass{minimal}
 
 \begin{document}
 
@@ -12,7 +11,6 @@
 \FORMAT{latex2e}
 \CLASS{article}
 \PACKAGE[xyz]{abc}
-\ISCFGLOADED
 
 \TEST{\afterassignment}{
   \def\x{\afterassignment{\edef\y{world}}\foo}
diff --git a/l3build/testfiles/00-test-1.tlg b/l3build/testfiles/00-test-1.tlg
index 1a5dd68..691718a 100644
--- a/l3build/testfiles/00-test-1.tlg
+++ b/l3build/testfiles/00-test-1.tlg
@@ -21,17 +21,14 @@ Main Class: article
 Package: abc
 Options: xyz
 ============================================================
-CFG FILE IS LOADED
-============================================================
-============================================================
 TEST 1: \afterassignment 
 ============================================================
 > hello.
 <argument> ...d}}\foo } \x ={hello} \showthe \foo 
 \show \y 
-l.22 }
+l. ...}
 > \y=macro:
 ->world.
 <argument> ... \x ={hello} \showthe \foo \show \y 
-l.22 }
+l. ...}
 ============================================================

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.