Skip to content

Commit e551aad

Browse files
Resolve #336 - Add install_bsd_arm command (#339)
* [AB#336] Fix makefile to unset user profile set env vars before tests * [AB#336] Fix broken test * [AB#336] add install_bsd_arm * [AB#336] test doesnt work correctly; for now
1 parent c4c5b76 commit e551aad

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ test-target: bats
2323
src/configure; \
2424
make -C src; \
2525
fi; \
26+
unset $${!GOENV_*}; \
2627
test_target=$${test_target:-test}; \
2728
exec bats $(TEST_TARGET_ARGS);
2829

@@ -33,6 +34,7 @@ test-goenv: bats
3334
src/configure; \
3435
make -C src; \
3536
fi; \
37+
unset $${!GOENV_*}; \
3638
test_target=$${test_target:-test}; \
3739
exec bats $${CI:+--tap} $$test_target;
3840

@@ -48,6 +50,7 @@ run-goenv-go-build-tests:
4850
src/configure; \
4951
make -C src; \
5052
fi; \
53+
unset $${!GOENV_*}; \
5154
test_target=$${test_target:-test}; \
5255
cd plugins/go-build; \
5356
exec bats $${CI:+--tap} $$test_target;

plugins/go-build/bin/go-build

+10
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,16 @@ install_linux_arm() {
280280
fi
281281
}
282282

283+
install_bsd_arm() {
284+
if [ "$(uname -s)" = "FreeBSD" ]; then
285+
local arch="$(uname -m)"
286+
287+
if [ $arch = "aarch64" ] || [ $arch = "armv6" ] || [ $arch = "armv7" ]; then
288+
install_package_using "tarball" 1 "$@"
289+
fi
290+
fi
291+
}
292+
283293
install_bsd_64bit() {
284294
if [ "$(uname -s)" = "FreeBSD" ]; then
285295
local arch="$(uname -m)"

plugins/go-build/test/fixtures/definitions/1.2.2

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ install_darwin_108_32bit "Go Darwin 10.8 32bit 1.2.2" "http://localhost:8090/1.2
66

77
install_darwin_108_64bit "Go Darwin 10.8 64bit 1.2.2" "http://localhost:8090/1.2.2/1.2.2.tar.gz#d7518d03fc9d7ac1d32c49358594ff6517712c3d3de4f80ebaa3229361f38937"
88

9+
install_bsd_arm "Go FreeBSD arm 1.2.2" "http://localhost:8090/1.2.2/1.2.2.tar.gz#d7518d03fc9d7ac1d32c49358594ff6517712c3d3de4f80ebaa3229361f38937"
10+
911
install_bsd_64bit "Go FreeBSD 64bit 1.2.2" "http://localhost:8090/1.2.2/1.2.2.tar.gz#d7518d03fc9d7ac1d32c49358594ff6517712c3d3de4f80ebaa3229361f38937"
1012

1113
install_bsd_32bit "Go FreeBSD 32bit 1.2.2" "http://localhost:8090/1.2.2/1.2.2.tar.gz#d7518d03fc9d7ac1d32c49358594ff6517712c3d3de4f80ebaa3229361f38937"

0 commit comments

Comments
 (0)