snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge pull request #229 from shlevy/pass-all-inputs

Browse source 
hydra-eval-jobs: Pass all inputs as 'inputs' arg.
This commit is contained in:
Eelco Dolstra 2015-08-04 14:19:23 +02:00
parent deee99b518 7b7f189b3e
commit 9e33f07cb8
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

@ -253,16 +253,29 @@ int main(int argc, char * * argv)
EvalState state(searchPath); EvalState state(searchPath);
AutoArgs autoArgs; AutoArgs autoArgs;
Value * inputsSet = state.allocValue();
state.mkAttrs(*inputsSet, autoArgs_.size());
for (auto & i : autoArgs_) { for (auto & i : autoArgs_) {
Symbol inputName = state.symbols.create(i.first);
bool first = true;
for (auto & j : i.second) { for (auto & j : i.second) {
Value * v = state.allocValue(); Value * v = state.allocValue();
if (j[0] == 'E') if (j[0] == 'E')
state.eval(state.parseExprFromString(string(j, 1), absPath(".")), *v); state.eval(state.parseExprFromString(string(j, 1), absPath(".")), *v);
else else
mkString(*v, string(j, 1)); mkString(*v, string(j, 1));
autoArgs[state.symbols.create(i.first)].push_back(v); autoArgs[inputName].push_back(v);
if (first) {
inputsSet->attrs->push_back(Attr(inputName, v));
first = false;
}
} }
} }
Symbol sInputs = state.symbols.create("inputs");
if (autoArgs.find(sInputs) == autoArgs.end()) {
inputsSet->attrs->sort();
autoArgs[sInputs].push_back(inputsSet);
}
store = openStore(); store = openStore();