Work around differences in GitHub CI vs. Travis

Author: ScottPJones

deps/build.jl

@@ -4,7 +4,7 @@ using StrTables
 
 const VER = UInt32(1)
 
-const datapath = "../data"
+const datapath = joinpath(@__DIR__, "..", "data")
 const dpath = "https://www.unicode.org/Public/UCD/latest/ucd/"
 const inpname = "UnicodeData.txt"
 const fname = "unicode.dat"
@@ -48,10 +48,15 @@ function load_unicode_data(datapath, dpath, fname)
         println("Loading Unicode Data: ", lname)
         src = lname
     else
-        src = string(dpath, fname)
-        println("Downloading Unicode Data: ", src)
-        download(src, lname)
-        println("Saved to: ", lname)
+        try
+            src = string(dpath, fname)
+            println("Downloading Unicode Data: ", src)
+            download(src, lname)
+            println("Saved to: ", lname)
+        catch ex
+            println("Unable to download $src and save in $lname")
+            rethrow(ex)
+        end
     end
     symnam = String[]
     symval = UInt32[]
@@ -280,10 +285,10 @@ else
     try
         global tup
         tup = make_tables(datapath, dpath, inpname)
+        println("Saving tables to ", savfile)
+        StrTables.save(savfile, tup)
+        println("Done")
     catch ex
         println(sprint(showerror, ex, catch_backtrace()))
     end
-    println("Saving tables to ", savfile)
-    StrTables.save(savfile, tup)
-    println("Done")
 end

test/runtests.jl

@@ -1,13 +1,13 @@
 using StrTables, Unicode_Entities
 
-@static VERSION < v"0.7.0-DEV" ? (using Base.Test) : (using Test)
+using Test
 
 # Test the functions lookupname, matches, longestmatches, completions
 # Check that characters from all 3 tables (BMP, non-BMP, 2 character) are tested
 
 const def = Unicode_Entities.default
 
-const datapath = "../data"
+const datapath = joinpath(pathof(Unicode_Entities), "data")
 const dpath = "ftp://ftp.unicode.org/Public/UNIDATA/"
 const fname = "UnicodeData.txt"
 
@@ -17,7 +17,15 @@ const symval = Vector{Char}()
 """Load up all names and characters from original data file"""
 function load_unicode_data()
     lname = joinpath(datapath, fname)
-    isfile(lname) || download(string(dpath, fname), lname)
+    if !isfile(lname)
+        try
+            lname = download(string(dpath, fname), lname)
+        catch ex
+            println("Error loading \"$(string(dpath, fname))\" and saving in \"$lname\"")
+            println(sprint(showerror, ex, catch_backtrace()))
+            return false
+        end
+    end
     aliasnam = Vector{String}()
     aliasval = Vector{Char}()
     open(lname, "r") do f
@@ -48,13 +56,11 @@ function load_unicode_data()
             push!(symval, ch)
         end
     end
+    true
 end
 
-load_unicode_data()
-
 @testset "Unicode_Entities" begin
-
-    @testset "matches data file" begin
+if load_unicode_data() @testset "matches data file" begin
         for (i, ch) in enumerate(symval)
             list = matchchar(def, ch)
             if !isempty(list)
@@ -68,6 +74,7 @@ load_unicode_data()
             end
         end
     end
+end
 
 @testset "lookupname" begin
     @test lookupname(def, "foobar")   == ""