From ef84c15494940eaaf0dff974b4f44aff1b4de0c0 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Mon, 24 Sep 2018 17:59:33 -0400 Subject: [PATCH 1/4] [CI] updates pinned vere commit hash --- .travis/pin-vere-commit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/pin-vere-commit.txt b/.travis/pin-vere-commit.txt index 33a3ba110..e0667f69a 100644 --- a/.travis/pin-vere-commit.txt +++ b/.travis/pin-vere-commit.txt @@ -1 +1 @@ -ab4b327e82ff4ee21a332df8ccc426ed7c7a1897 \ No newline at end of file +89479463e5a39ef9ede4e5c414ca5c5721520100 \ No newline at end of file From cd989292031c12d76a57813d9208cc2629b00b9d Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Mon, 24 Sep 2018 18:24:42 -0400 Subject: [PATCH 2/4] [CI] always print vere arguments --- .travis/runner.ls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis/runner.ls b/.travis/runner.ls index 125f3d5e2..40c82113b 100644 --- a/.travis/runner.ls +++ b/.travis/runner.ls @@ -8,6 +8,8 @@ export class Urbit @pty = pty.spawn \urbit args @pty.on \data ~> @stdout.write it # TODO pipe? console.log "FIXME Running Ubuntu 14.04, which causes a libtinfo version info warning. Should update to 16.04." + console.log "starting vere with the following arguments:" + console.log args # @last-output = Date.now() @pty.on \data ~> @last-output = Date.now() From 282d5cc09d700ed6a699d3baf4cc383a72a3e48f Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Mon, 24 Sep 2018 18:04:59 -0400 Subject: [PATCH 3/4] [CI] fixes livescript urbit-wrapper argument indices --- .travis/in-urbit.ls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/in-urbit.ls b/.travis/in-urbit.ls index 02d90cb20..09470c5d8 100644 --- a/.travis/in-urbit.ls +++ b/.travis/in-urbit.ls @@ -2,7 +2,7 @@ require! <[ split ]> {through} = require 'promise-streams' {Urbit,ERROR} = require './runner.ls' -urbit = new Urbit process.argv[2 to] +urbit = new Urbit process.argv[3 to] urbit.expect ERROR .then -> process.exit 1 From 6d87d9ddb6e7d114284cdf33b37ddf7a63683b5c Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Mon, 24 Sep 2018 18:34:40 -0400 Subject: [PATCH 4/4] run test framework before compilation/renderer specs in :test --- .travis/test.ls | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis/test.ls b/.travis/test.ls index 8dd19ef28..f0772cb8e 100644 --- a/.travis/test.ls +++ b/.travis/test.ls @@ -13,6 +13,16 @@ Promise.resolve urbit <- urb.expect-echo "%dojo-booted" .then urb.reset-listeners! ] +.then (urb)-> + urb.note "Running /===/tests" + errs = "" #REVIEW stream reduce? + urb.every /(\/[ -~]* (FAILED|CRASHED))/, ([_,result])-> + if !errs => urb.warn "First error" + errs += "\n #result" + <- urb.line "+test, =defer |, =seed `@uvI`(shaz %reproducible)" .then + <- urb.expect-echo "%ran-tests" .then + if errs => throw Error errs + urb.reset-listeners! .then (urb)-> urb.note "Testing compilation" errs = {} #REVIEW stream reduce? @@ -44,16 +54,6 @@ Promise.resolve urbit errs := Object.keys errs if errs.length => throw Error "in #errs" urb.reset-listeners! -.then (urb)-> - urb.note "Running /===/tests" - errs = "" #REVIEW stream reduce? - urb.every /(\/[ -~]* (FAILED|CRASHED))/, ([_,result])-> - if !errs => urb.warn "First error" - errs += "\n #result" - <- urb.line "+test, =defer |, =seed `@uvI`(shaz %reproducible)" .then - <- urb.expect-echo "%ran-tests" .then - if errs => throw Error errs - urb.reset-listeners! .then -> urbit.exit 0 .catch (err)->