diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats index 8e3ce566..95ab1fc8 100644 --- a/plugins/python-build/test/build.bats +++ b/plugins/python-build/test/build.bats @@ -62,7 +62,7 @@ assert_build_log() { cached_tarball "yaml-0.1.6" cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub brew false stub_make_install stub_make_install @@ -104,7 +104,7 @@ OUT cached_tarball "yaml-0.1.6" "$yaml_configure" cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub brew false stub_make_install stub_make_install "$PYTHON_MAKE_INSTALL_TARGET" @@ -132,7 +132,7 @@ OUT cached_tarball "yaml-0.1.6" cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub brew false stub_make_install stub_make_install @@ -162,7 +162,7 @@ OUT cached_tarball "yaml-0.1.6" cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub brew false stub_make_install stub_make_install @@ -194,8 +194,8 @@ OUT BREW_PREFIX="$TMP/homebrew-prefix" mkdir -p "$BREW_PREFIX" - for i in {1..9}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' stub brew "--prefix : echo '$BREW_PREFIX'" false stub_make_install @@ -222,8 +222,8 @@ OUT brew_libdir="$TMP/homebrew-yaml" mkdir -p "$brew_libdir" - for i in {1..10}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' stub brew "--prefix libyaml : echo '$brew_libdir'" for i in {1..6}; do stub brew false; done stub_make_install @@ -249,8 +249,8 @@ OUT readline_libdir="$TMP/homebrew-readline" mkdir -p "$readline_libdir" - for i in {1..8}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' for i in {1..3}; do stub brew false; done stub brew "--prefix readline : echo '$readline_libdir'" for i in {1..2}; do stub brew false; done @@ -279,8 +279,8 @@ OUT ncurses_libdir="$TMP/homebrew-ncurses" mkdir -p "$ncurses_libdir" - for i in {1..9}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' for i in {1..4}; do stub brew false; done stub brew "--prefix ncurses : echo '$ncurses_libdir'" stub brew false @@ -307,9 +307,9 @@ OUT @test "openssl is linked from Ports in FreeBSD if present" { cached_tarball "Python-3.6.2" - for i in {1..7}; do stub uname '-s : echo FreeBSD'; done + stub uname '-s : echo FreeBSD' stub uname '-r : echo 11.0-RELEASE' - for i in {1..3}; do stub uname '-s : echo FreeBSD'; done + stub uname '-s : echo FreeBSD' stub sysctl '-n hw.ncpu : echo 1' stub pkg "info -e openssl : true" @@ -341,9 +341,9 @@ OUT for lib in readline sqlite3; do - for i in {1..7}; do stub uname '-s : echo FreeBSD'; done + stub uname '-s : echo FreeBSD' stub uname '-r : echo 11.0-RELEASE' - for i in {1..3}; do stub uname '-s : echo FreeBSD'; done + stub uname '-s : echo FreeBSD' stub sysctl '-n hw.ncpu : echo 1' stub pkg false @@ -376,8 +376,8 @@ OUT @test "homebrew is not touched if PYTHON_BUILD_SKIP_HOMEBREW is set" { cached_tarball "Python-3.6.2" - for i in {1..4}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' stub brew true; brew stub_make_install export PYTHON_BUILD_SKIP_HOMEBREW=1 @@ -405,7 +405,7 @@ OUT BREW_PREFIX="$TMP/homebrew-prefix" mkdir -p "$BREW_PREFIX" - for i in {1..4}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub brew "--prefix : echo '$BREW_PREFIX'" for i in {1..5}; do stub brew false; done stub_make_install @@ -435,7 +435,7 @@ OUT BREW_PREFIX="${BREW_PREFIX%/*}" BREW_PREFIX="${BREW_PREFIX%/*}" - for i in {1..4}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub brew "--prefix : echo '$BREW_PREFIX'" for i in {1..5}; do stub brew false; done stub_make_install @@ -464,7 +464,7 @@ OUT BREW_PREFIX="$TMP/homebrew-prefix" mkdir -p "$BREW_PREFIX" - for i in {1..9}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' for i in {1..5}; do stub brew "--prefix : echo '$BREW_PREFIX'"; done stub_make_install @@ -493,8 +493,8 @@ OUT mkdir -p "$readline_libdir/include/readline" touch "$readline_libdir/include/readline/rlconf.h" - for i in {1..8}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' for i in {1..5}; do stub brew false; done stub_make_install @@ -525,8 +525,8 @@ OUT mkdir -p "$tcl_tk_libdir/lib" echo "TCL_VERSION='$tcl_tk_version'" >>"$tcl_tk_libdir/lib/tclConfig.sh" - for i in {1..9}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' stub brew false stub brew "--prefix tcl-tk@8 : echo '$tcl_tk_libdir'" @@ -559,8 +559,8 @@ OUT tcl_tk_version_long="8.6.10" tcl_tk_version="${tcl_tk_version_long%.*}" - for i in {1..8}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' for i in {1..4}; do stub brew false; done stub_make_install @@ -587,8 +587,8 @@ OUT @test "tcl-tk is linked from Homebrew via pkgconfig only when envvar is set" { cached_tarball "Python-3.6.2" - for i in {1..9}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' tcl_tk_libdir="$TMP/homebrew-tcl-tk" mkdir -p "$tcl_tk_libdir/lib" @@ -620,7 +620,7 @@ OUT @test "number of CPU cores defaults to 2" { cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' for i in {1..2}; do stub sw_vers '-productVersion : echo 10.10'; done stub sysctl false @@ -647,7 +647,7 @@ OUT @test "number of CPU cores is detected on Mac" { cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' for i in {1..2}; do stub sw_vers '-productVersion : echo 10.10'; done stub sysctl '-n hw.ncpu : echo 4' @@ -675,9 +675,9 @@ OUT @test "number of CPU cores is detected on FreeBSD" { cached_tarball "Python-3.6.2" - for i in {1..7}; do stub uname '-s : echo FreeBSD'; done + stub uname '-s : echo FreeBSD' stub uname '-r : echo 11.0-RELEASE' - for i in {1..3}; do stub uname '-s : echo FreeBSD'; done + stub uname '-s : echo FreeBSD' for i in {1..3}; do stub pkg false; done stub sysctl '-n hw.ncpu : echo 1' @@ -704,7 +704,7 @@ OUT @test "setting PYTHON_MAKE_INSTALL_OPTS to a multi-word string" { cached_tarball "Python-3.6.2" - for i in {1..9}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub_make_install @@ -728,7 +728,7 @@ OUT @test "--enable-shared is not added if --disable-shared is passed" { cached_tarball "Python-3.6.2" - for i in {1..9}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub_make_install @@ -752,8 +752,8 @@ OUT @test "configuring with dSYM in MacOS" { cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Darwin'; done - for i in {1..2}; do stub sw_vers '-productVersion : echo 1010'; done + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 1010' for i in {1..6}; do stub brew false; done stub_make_install @@ -779,7 +779,7 @@ OUT @test "configuring with dSYM has no effect in non-MacOS" { cached_tarball "Python-3.6.2" - for i in {1..10}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' stub_make_install run_inline_definition <> build.log' stub_make_install diff --git a/plugins/python-build/test/compiler.bats b/plugins/python-build/test/compiler.bats index 61ff22be..998b977c 100644 --- a/plugins/python-build/test/compiler.bats +++ b/plugins/python-build/test/compiler.bats @@ -9,7 +9,7 @@ export -n PYTHON_CONFIGURE_OPTS @test "require_gcc on OS X 10.9" { - for i in {1..3}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' for i in {1..2}; do stub sw_vers '-productVersion : echo 10.9.5'; done stub gcc '--version : echo 4.2.1' @@ -31,7 +31,7 @@ OUT } @test "require_gcc on OS X 10.10" { - for i in {1..3}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' for i in {1..2}; do stub sw_vers '-productVersion : echo 10.10'; done stub gcc '--version : echo 4.2.1' @@ -69,7 +69,7 @@ DEF mkdir -p "$INSTALL_ROOT" cd "$INSTALL_ROOT" - for i in {1..10}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' for i in {1..3}; do stub sw_vers '-productVersion : echo 10.10'; done stub cc 'false' diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats index a4d45901..4fc46a8d 100644 --- a/plugins/python-build/test/pyenv_ext.bats +++ b/plugins/python-build/test/pyenv_ext.bats @@ -144,7 +144,7 @@ OUT echo "bar" | install_patch definitions/vanilla-python "Python-3.6.2/bar.patch" echo "baz" | install_patch definitions/vanilla-python "Python-3.6.2/baz.patch" - for i in {1..2}; do stub uname '-s : echo Linux'; done + stub uname '-s : echo Linux' TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null assert_success @@ -171,7 +171,7 @@ OUT " : echo \"$MAKE \$@\" >> build.log" \ " : echo \"$MAKE \$@\" >> build.log && cat build.log >> '$INSTALL_ROOT/build.log'" - for i in {1..4}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' PYTHON_MAKE_INSTALL_TARGET="altinstall" TMPDIR="$TMP" install_tmp_fixture definitions/vanilla-python < /dev/null assert_success @@ -253,7 +253,7 @@ OUT done unset framework_path executable - for i in {1..3}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' PYTHON_CONFIGURE_OPTS="--enable-framework" TMPDIR="$TMP" run_inline_definition <> build.log" \ " : echo \"$MAKE \$@\" >> build.log && cat build.log >> '$INSTALL_ROOT/build.log'" @@ -346,7 +346,7 @@ OUT @test "default MACOSX_DEPLOYMENT_TARGET" { # yyuu/pyenv#257 - for i in {1..3}; do stub uname '-s : echo Darwin'; done + stub uname '-s : echo Darwin' for i in {1..2}; do stub sw_vers '-productVersion : echo 10.10'; done TMPDIR="$TMP" run_inline_definition <