From df52b500bf66d97942e100d0319644c828d49fd6 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 6 Aug 2022 17:25:56 -0400 Subject: [PATCH] Fix tinygo-test with Go 1.19 One of the internal packages used for tests was moved in that version. --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 60a5a574..88c47357 100644 --- a/Makefile +++ b/Makefile @@ -280,7 +280,6 @@ TEST_PACKAGES_FAST = \ container/list \ container/ring \ crypto/des \ - crypto/elliptic/internal/fiat \ crypto/internal/subtle \ crypto/md5 \ crypto/rc4 \ @@ -317,6 +316,14 @@ TEST_PACKAGES_FAST = \ unicode \ unicode/utf16 \ unicode/utf8 \ + $(nil) + +# Assume this will go away before Go2, so only check minor version. +ifeq ($(filter $(shell $(GO) env GOVERSION | cut -f 2 -d.), 16 17 18), ) +TEST_PACKAGES_FAST += crypto/internal/nistec/fiat +else +TEST_PACKAGES_FAST += crypto/elliptic/internal/fiat +endif # archive/zip requires os.ReadAt, which is not yet supported on windows # debug/plan9obj requires os.ReadAt, which is not yet supported on windows