mirror of
https://github.com/dlang/dmd.git
synced 2025-05-01 07:30:14 +03:00
run tests without activated host compiler
- fixes issues where the activated release dmd overrides and hijacks the link paths of the generated dmd (by it's set LIBRARY_PATH/LD_LIBRARY_PATH) - build and test commands already activate and deactivate host compiler where necessary
This commit is contained in:
parent
02382c4848
commit
1e81c60cde
2 changed files with 3 additions and 3 deletions
4
ci.sh
4
ci.sh
|
@ -156,7 +156,7 @@ download_install_sh() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
activate_d() {
|
install_d() {
|
||||||
local install_sh="install.sh"
|
local install_sh="install.sh"
|
||||||
download_install_sh "$install_sh"
|
download_install_sh "$install_sh"
|
||||||
# DUB isn't needed for gdc
|
# DUB isn't needed for gdc
|
||||||
|
@ -166,5 +166,5 @@ activate_d() {
|
||||||
# shellcheck disable=2016
|
# shellcheck disable=2016
|
||||||
sed 's/dub="dub-$(fetch $url)"/dub=dub/' -i "$install_sh"
|
sed 's/dub="dub-$(fetch $url)"/dub=dub/' -i "$install_sh"
|
||||||
fi
|
fi
|
||||||
CURL_USER_AGENT="$CURL_USER_AGENT" bash "$install_sh" "$1" --activate
|
CURL_USER_AGENT="$CURL_USER_AGENT" bash "$install_sh" "$1"
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ source ci.sh
|
||||||
# Always source a DMD instance
|
# Always source a DMD instance
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
source "$(activate_d "$DMD")"
|
install_d "$DMD"
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Define commands
|
# Define commands
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue