From adbefcdd14a3ed9c81f29137b439dd1f0a04e1dd Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sun, 15 Nov 2015 23:15:58 -0500 Subject: [PATCH 1/2] Fix test for array indexing breakage --- test/subviews.jl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/subviews.jl b/test/subviews.jl index 59a0b3a..5496cbd 100644 --- a/test/subviews.jl +++ b/test/subviews.jl @@ -30,8 +30,14 @@ function _test_arrview(a, r, subs...) _test_arrview_contents(unsafe_view(a, subs...), r) end -macro test_arrview(a_, subs...) - esc(:(_test_arrview($a_, ($a_)[$(subs...)], $(subs...)))) +if VERSION >= v"0.4" + macro test_arrview(a_, subs...) + esc(:(_test_arrview($a_, sub($a_, $(subs...)), $(subs...)))) + end +else + macro test_arrview(a_, subs...) + esc(:(_test_arrview($a_, $a_[$(subs...)], $(subs...)))) + end end #### test views from arrays From 83d2476bf0f879e5db2c7ddb636a6e96efee8094 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sun, 15 Nov 2015 23:19:04 -0500 Subject: [PATCH 2/2] travis.yml clean up and actually test non-nightly versions --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e29764..9618712 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,7 @@ julia: - 0.3 - 0.4 - nightly -before_install: - - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi -script: - - julia -e 'versioninfo(); Pkg.init(); Pkg.clone(pwd());' - - if [ $TRAVIS_JULIA_VERSION = "nightly" ]; then julia -e 'Pkg.test("ArrayViews", coverage=true)'; fi - - if [ $TRAVIS_JULIA_VERSION = "release" ]; then julia -e 'Pkg.test("ArrayViews")'; fi after_success: - - if [ $TRAVIS_JULIA_VERSION = "nightly" ]; then julia -e 'cd(Pkg.dir("ArrayViews")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'; fi + - if [ $TRAVIS_JULIA_VERSION != "0.3" ]; then julia -e 'cd(Pkg.dir("ArrayViews")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'; fi notifications: email: false