From 081ab36237f448f36e40dc1f7c5a80ba0e7deae8 Mon Sep 17 00:00:00 2001 From: Syrus Date: Thu, 16 Apr 2020 13:26:24 -0700 Subject: [PATCH] Simplified azure testing --- Makefile | 3 ++- azure-pipelines.yml | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ba159be10..151a2aa4f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ .PHONY: spectests emtests clean build install lint precommit docs examples -# Uname only works in *Unix like systems +# uname only works in *Unix like systems ifneq ($(OS), Windows_NT) ARCH := $(shell uname -m) UNAME_S := $(shell uname -s) else + # We can assume, if in windows it will likely be in x86_64 ARCH := x86_64 UNAME_S := endif diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fb8e7113c..ec48fd55b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -93,14 +93,11 @@ jobs: condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin')) - bash: make test displayName: Tests (*nix) - condition: and(succeeded(), eq(variables['Agent.OSArchitecture'], 'X64'), not(eq(variables['Agent.OS'], 'Windows_NT')), not(variables['ANDROID'])) - - bash: make spectests-singlepass - displayName: Tests (Linux ARM) - condition: and(succeeded(), eq(variables['Agent.OSArchitecture'], 'ARM64'), not(variables['ANDROID'])) + condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')), not(variables['ANDROID'])) - bash: make test-android displayName: Tests (Android) condition: and(succeeded(), variables['ANDROID']) - - bash: make spectests-cranelift + - bash: make spectests displayName: Tests (Windows) condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), not(variables['ANDROID']))