mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-09-16 14:23:58 +00:00
Merge branch 'QB64-Phoenix-Edition:main' into main
This commit is contained in:
commit
21f6a9d286
2 changed files with 14 additions and 5 deletions
|
@ -1,8 +1,7 @@
|
|||
# Argument 1: Location of qb64pe (blank means current directory
|
||||
# Argument 2: If not blank, qb64pe will not be started after compiltaion
|
||||
# Argument 1: If not blank, qb64pe will not be started after compiltaion
|
||||
|
||||
cd "$(dirname "$1")"
|
||||
dont_run="$2"
|
||||
cd "$(dirname "$0")"
|
||||
dont_run="$1"
|
||||
|
||||
Pause()
|
||||
{
|
||||
|
|
|
@ -35,7 +35,17 @@ case "$2" in
|
|||
;;
|
||||
|
||||
osx)
|
||||
./setup_osx.command "." "dont_run" 1>"$RESULTS_DIR/osx-setup.txt"
|
||||
# When testing the OSX script we run it from a different directory as
|
||||
# that is the typical way it is used.
|
||||
pushd . > /dev/null
|
||||
cd "$ROOT"
|
||||
|
||||
$1/setup_osx.command "dont_run" 1>"$RESULTS_DIR/osx-setup.txt"
|
||||
ERR=$?
|
||||
|
||||
popd > /dev/null
|
||||
|
||||
(exit $ERR)
|
||||
assert_success_named "OSX setup" cat "$RESULTS_DIR/osx-setup.txt"
|
||||
;;
|
||||
esac
|
||||
|
|
Loading…
Reference in a new issue