nuke the cpu detection
This commit is contained in:
parent
5ca065728d
commit
495fd1900e
@ -1,5 +1,5 @@
|
||||
module Jasmine
|
||||
module Headless
|
||||
VERSION = "0.7.3"
|
||||
VERSION = "0.8.0"
|
||||
end
|
||||
end
|
||||
|
@ -2,12 +2,6 @@ require 'rbconfig'
|
||||
require 'rubygems'
|
||||
require 'rubygems/version'
|
||||
|
||||
begin
|
||||
require 'facter'
|
||||
rescue LoadError
|
||||
warn 'Including Facter allows for detection of # of cpus, resulting in faster compilations.'
|
||||
end
|
||||
|
||||
module Qt
|
||||
class NotInstalledError < StandardError; end
|
||||
class Qmake
|
||||
@ -45,11 +39,7 @@ module Qt
|
||||
|
||||
system command(project_file)
|
||||
|
||||
system %{make #{make_options}}
|
||||
end
|
||||
|
||||
def make_options
|
||||
"-j#{number_of_cpus}"
|
||||
system %{make}
|
||||
end
|
||||
|
||||
#
|
||||
@ -103,14 +93,6 @@ module Qt
|
||||
end.compact.join(" ")
|
||||
end
|
||||
|
||||
def number_of_cpus
|
||||
if defined?(Facter)
|
||||
Facter.sp_number_processors rescue Facter.processorcount
|
||||
else
|
||||
1
|
||||
end
|
||||
end
|
||||
|
||||
def get_exe_path(command)
|
||||
path = %x{which #{command}}.strip
|
||||
path = nil if path == ''
|
||||
|
@ -138,16 +138,5 @@ describe Qt::Qmake do
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.make_options' do
|
||||
let(:cpu_count) { 3 }
|
||||
subject { Qt::Qmake.make_options }
|
||||
|
||||
before do
|
||||
Qt::Qmake.stubs(:number_of_cpus).returns(cpu_count)
|
||||
end
|
||||
|
||||
it { should == "-j#{cpu_count}" }
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user