origen 0.7.20 → 0.7.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/version.rb +1 -1
- data/lib/origen/regression_manager.rb +17 -4
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f76d497c905280cf72bbd0cb557394efb9de93ec
|
|
4
|
+
data.tar.gz: ed16dfa8b87b2332343c60726cebe88a7823887b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f4f7a3211f862fbb198e17ae087244d6c350f19fd1b088f7f3e42ca133e183eb027edc57b326cdf0f14405a81a58d8fc41d01ff61c6962ba3f4b13626d4f3dff
|
|
7
|
+
data.tar.gz: 17d8ac1c25a3838b0421429286855bfdc9d937284581f51599a440fac938d05d3793f5206294889919cb4c41f8c94a47740cddea2f1abf2b2f39574bcd612942
|
data/config/version.rb
CHANGED
|
@@ -59,10 +59,23 @@ module Origen
|
|
|
59
59
|
Dir.chdir reference_origen_root do
|
|
60
60
|
Bundler.with_clean_env do
|
|
61
61
|
system 'rm -rf lbin'
|
|
62
|
-
#
|
|
63
|
-
#
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
# If regression is run using a service account, we need to setup the path/bundler manually
|
|
63
|
+
# The regression manager needs to be passed a --service_account option when initiated.
|
|
64
|
+
if options[:service_account]
|
|
65
|
+
puts "Running with a service account, setting up the workspace manually now, assuming it runs BASH!! <-- can't assume bash always"
|
|
66
|
+
puts 'This is not an ideal way, need to discuss. Though, a normal user will never set service_account to true'
|
|
67
|
+
# Future enhancement, probably add the sourcing of files in a service_origen_setup file.
|
|
68
|
+
# Check if service_origen_setup exists, if it does, load/execute the file. If not, ask user to provide it.
|
|
69
|
+
# If running as a service account, service_origen_setup file is NOT optional.
|
|
70
|
+
# More enhancements to come on this bit of code, but if someone finds a better cleaner way, I am happy to discuss the issues I have seen and come up with a solution.
|
|
71
|
+
system 'source ~/.bash_profile'
|
|
72
|
+
system 'source ~/.bashrc.user'
|
|
73
|
+
system 'bundle install --gemfile Gemfile --binstubs lbin --path ~/.origen/gems/' # this needs to be executed as 'origen -v' does not seem to handle it on its own.
|
|
74
|
+
system 'origen -v' # Let origen handle the gems installation and bundler setup.
|
|
75
|
+
else
|
|
76
|
+
system 'bundle exec origen -v'
|
|
77
|
+
system 'bundle install' # Make sure bundle updates the necessary config/gems required for Origen.
|
|
78
|
+
end
|
|
66
79
|
Origen.log.info '######################################################'
|
|
67
80
|
Origen.log.info 'running regression command in reference workspace...'
|
|
68
81
|
Origen.log.info '######################################################'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: origen
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.21
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Stephen McGinty
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-06-
|
|
11
|
+
date: 2016-06-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -568,7 +568,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
568
568
|
version: 1.8.11
|
|
569
569
|
requirements: []
|
|
570
570
|
rubyforge_project:
|
|
571
|
-
rubygems_version: 2.
|
|
571
|
+
rubygems_version: 2.2.2
|
|
572
572
|
signing_key:
|
|
573
573
|
specification_version: 4
|
|
574
574
|
summary: The Semiconductor Developer's Kit
|