Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vmthreadingfix #423

Merged
merged 3 commits into from
Dec 5, 2019
Merged

Vmthreadingfix #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58da508
Switch build threads down to 1 to fix ubuntu 18 bug
pjt0620 Dec 5, 2019
062aeaf
Dynamicley scale vm core count based on host comp
pjt0620 Dec 5, 2019
158bed9
Added check for single core processors
pjt0620 Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,25 @@
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"

def total_cpus
require 'etc'
Etc.nprocessors
end

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# For a complete reference, please see the online documentation at
# vagrantup.com.

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "bento/ubuntu-18.04"
config.vm.box_version = "201912.03.0"
config.vm.provider :virtualbox do |v|
if total_cpus > 1
v.cpus = total_cpus - 1
else
v.cpus = 1
end
end

# Check for proxy enviroment variable and set it
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
Expand All @@ -31,7 +44,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
end


config.vm.box_download_insecure = true
config.vm.provision "shell", privileged: false, keep_color: true do |s|
s.inline = "ln -fs /vagrant vi-firmware;"
s.inline += "VAGRANT=1 vi-firmware/script/bootstrap.sh"
Expand Down
6 changes: 3 additions & 3 deletions fabfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ def test(long=False):

with(lcd("src")):
if long in (True, 'True', 'true'):
local("PLATFORM=TESTING make -j4 test_long")
local("PLATFORM=TESTING make -j1 test_long")
else:
local("PLATFORM=TESTING make -j4 test")
local("PLATFORM=TESTING make -j1 test")

@task
def functional_test_flash(skip_flashing=False):
Expand Down Expand Up @@ -338,7 +338,7 @@ def build(capture=False, do_clean=False):
with lcd("%s/src" % env.root_dir):
if do_clean:
clean();
output = local("%s make -j4" % options, capture=capture)
output = local("%s make -j1 " % options, capture=capture)
if output.failed:
puts(output)
abort(red("Building %s failed" % board_options['name']))
Expand Down