Commit fc6e0ae6 authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Fix comparing OS X version when it has 3 components

parent de155dd1

bin/ruby-build

+3 −4
Original line number Diff line number Diff line
@@ -89,10 +89,9 @@ os_information() { 
# 10.9  -> 1009

# 10.10 -> 1010

osx_version() {

  local ver="$(sw_vers -productVersion)"

  local major="${ver%.*}"

  local minor="${ver#*.}"

  echo $(( major*100 + minor ))

  local -a ver

  IFS=. ver=( `sw_vers -productVersion` )

  echo $(( ${ver[0]}*100 + ${ver[1]} ))

}



build_failed() {

test/compiler.bats

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ export -n CC 


@test "require_gcc on OS X 10.9" {

  stub uname '-s : echo Darwin'

  stub sw_vers '-productVersion : echo 10.9'

  stub sw_vers '-productVersion : echo 10.9.5'

  stub gcc '--version : echo 4.2.1'



  run_inline_definition <<DEF