Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Mon, 1 May 2017 16:53:33 +0000 (09:53 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Mon, 1 May 2017 16:53:33 +0000 (09:53 -0700)
1  2 
src/runtime/runtime.pkg
tests/check.scm

Simple merge
diff --cc tests/check.scm
index 1ccdec9cc87e6ba5d7783188d9d1b9d254450198,cce540fb70f8a8095bdeb7874826cf6b8fc9caa5..dd098102b16a6dee8edc6641a433bfd14085e8ef
@@@ -68,12 -68,13 +68,13 @@@ USA
      "runtime/test-process"
      "runtime/test-readwrite"
      "runtime/test-regsexp"
+     "runtime/test-rgxcmp"
      "runtime/test-string"
      "runtime/test-string-normalization"
+     "runtime/test-thread-queue"
      "runtime/test-url"
      ("runtime/test-wttree" (runtime wt-tree))
 -    ;;"ffi/test-ffi"
 +    "ffi/test-ffi.scm"
      ))
  
  (with-working-directory-pathname