Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update gnovm Makefile #1371

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/gnovm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ jobs:
- _test.gnolang.native
- _test.gnolang.stdlibs
- _test.gnolang.realm
- _test.gnolang.pkg0
- _test.gnolang.pkg1
- _test.gnolang.pkg2
- _test.gnolang.pkg
- _test.gnolang.bytes
- _test.gnolang.pkg.regexp
- _test.gnolang.other
runs-on: ubuntu-latest
timeout-minutes: 15
Expand Down
8 changes: 8 additions & 0 deletions examples/gno.land/p/demo/flow/io_test.gno
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ func nextStatus(m *Monitor) Status {
if s := m.Status(); s.Samples != samples {
return s
}

ios_test.Sleep(5 * time.Millisecond)
}

return m.Status()
}

Expand Down Expand Up @@ -100,12 +102,14 @@ func TestReader(t *testing.T) {
{false, start, _300ms, 0, 20, 3, 0, 0, 67, 100, 0, 0, 0},
{false, start, _300ms, 0, 20, 3, 0, 0, 67, 100, 0, 0, 0},
}

for i, s := range status {
// XXX s := s
if !statusesAreEqual(&s, &want[i]) {
t.Errorf("r.Status(%v)\nexpected: %v\ngot : %v", i, want[i].String(), s.String())
}
}

if !bytes.Equal(b[:20], in[:20]) {
t.Errorf("r.Read() input doesn't match output")
}
Expand All @@ -114,9 +118,11 @@ func TestReader(t *testing.T) {
// XXX blocking writer test doesn't work.
func _TestWriter(t *testing.T) {
b := make([]byte, 100)

for i := range b {
b[i] = byte(i)
}

w := NewWriter(&bytes.Buffer{}, 200)
start := time.Now()

Expand Down Expand Up @@ -162,12 +168,14 @@ func _TestWriter(t *testing.T) {
{true, start, _400ms, 0, 80, 4, 200, 200, 200, 200, 20, _100ms, 80000},
{true, start, _500ms, _100ms, 100, 5, 200, 200, 200, 200, 0, 0, 100000},
}

for i, s := range status {
// XXX s := s
if !statusesAreEqual(&s, &want[i]) {
t.Errorf("w.Status(%v)\nexpected: %v\ngot : %v\n", i, want[i].String(), s.String())
}
}

if !bytes.Equal(b, w.Writer.(*bytes.Buffer).Bytes()) {
t.Errorf("w.Write() input doesn't match output")
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package vault

import (
"std"
Expand Down
8 changes: 4 additions & 4 deletions gnovm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ _test.pkg:
go test ./pkg/... $(GOTEST_FLAGS)

.PHONY: _test.gnolang
_test.gnolang: _test.gnolang.native _test.gnolang.stdlibs _test.gnolang.realm _test.gnolang.pkg0 _test.gnolang.pkg1 _test.gnolang.pkg2 _test.gnolang.other
_test.gnolang: _test.gnolang.native _test.gnolang.stdlibs _test.gnolang.realm _test.gnolang.pkg _test.gnolang.pkg.bytes _test.gnolang.pkg.regexp _test.gnolang.other
_test.gnolang.other:; go test tests/*.go -run "(TestFileStr|TestSelectors)" $(GOTEST_FLAGS)
_test.gnolang.realm:; go test tests/*.go -run "TestFiles/^zrealm" $(GOTEST_FLAGS)
_test.gnolang.pkg0:; go test tests/*.go -run "TestPackages/(bufio|crypto|encoding|errors|internal|io|math|sort|std|stdshim|strconv|strings|testing|unicode)" $(GOTEST_FLAGS)
_test.gnolang.pkg1:; go test tests/*.go -run "TestPackages/regexp" $(GOTEST_FLAGS)
_test.gnolang.pkg2:; go test tests/*.go -run "TestPackages/bytes" $(GOTEST_FLAGS)
_test.gnolang.pkg:; go test tests/*.go -run '^TestPackages$$' $(GOTEST_FLAGS)
_test.gnolang.pkg.bytes:; go test tests/*.go -run '^TestPackagesLong$$/^bytes' $(GOTEST_FLAGS)
_test.gnolang.pkg.regexp:; go test tests/*.go -run '^TestPackagesLong$$/^regexp' $(GOTEST_FLAGS) -test.pkg regexp/syntax
_test.gnolang.native:; go test tests/*.go -test.short -run "TestFilesNative/" $(GOTEST_FLAGS)
_test.gnolang.stdlibs:; go test tests/*.go -test.short -run 'TestFiles$$/' $(GOTEST_FLAGS)
_test.gnolang.native.sync:; go test tests/*.go -test.short -run "TestFilesNative/" --update-golden-tests $(GOTEST_FLAGS)
Expand Down
Loading