Move unicode and strings to run in parallel

test/Makefile

@@ -4,7 +4,7 @@ BUILDDIR := .
 include $(JULIAHOME)/Make.inc
 # TODO: this Makefile ignores BUILDDIR, except for computing JULIA_EXECUTABLE
 
-TESTS = all linalg sparse dates $(filter-out TestHelpers runtests testdefs,$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl $(SRCDIR)/linalg/*.jl)))
+TESTS = all linalg sparse unicode strings dates $(filter-out TestHelpers runtests testdefs,$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl $(SRCDIR)/linalg/*.jl)))
 
 default: all
 

test/choosetests.jl

@@ -16,7 +16,7 @@ Upon return, `tests` is a vector of fully-expanded test names, and
 function choosetests(choices = [])
     testnames = [
         "linalg", "subarray", "core", "inference", "keywordargs", "numbers",
-        "printf", "char", "string", "triplequote", "unicode",
+        "printf", "char", "strings", "triplequote", "unicode",
         "dates", "dict", "hashing", "iobuffer", "staged", "offsetarray",
         "arrayops", "tuple", "reduce", "reducedim", "random", "abstractarray",
         "intfuncs", "simdloop", "vecelement", "blas", "sparse",
@@ -71,6 +71,26 @@ function choosetests(choices = [])
         prepend!(tests, datestests)
     end
 
+    unicodetests = ["unicode/UnicodeError", "unicode/utf8proc", "unicode/utf8"]
+    if "unicode" in skip_tests
+        filter!(x -> (x != "unicode" && !(x in unicodetests)), tests)
+    elseif "unicode" in tests
+        # specifically selected case
+        filter!(x -> x != "unicode", tests)
+        prepend!(tests, unicodetests)
+    end
+
+    stringtests = ["strings/basic", "strings/search", "strings/util",
+                   "strings/io", "strings/types"]
+    if "strings" in skip_tests
+        filter!(x -> (x != "strings" && !(x in stringtests)), tests)
+    elseif "strings" in tests
+        # specifically selected case
+        filter!(x -> x != "strings", tests)
+        prepend!(tests, stringtests)
+    end
+
+
     sparsetests = ["sparse/sparse", "sparse/sparsevector"]
     if Base.USE_GPL_LIBS
         append!(sparsetests, ["sparse/umfpack", "sparse/cholmod", "sparse/spqr"])
@@ -114,7 +134,7 @@ function choosetests(choices = [])
     net_required_for = ["socket", "parallel", "libgit2"]
     net_on = true
     try
-        getipaddr()
+        ipa = getipaddr()
     catch
         warn("Networking unavailable: Skipping tests [" * join(net_required_for, ", ") * "]")
         net_on = false