[XTF PATCH v1 02/15] common: add per-test Xen bootargs file

[dmukhin@xxxxxxxx]

From: Denis Mukhin <dmukhin@xxxxxxxx>

Some tests (e.g. Argo) need special Xen configuration to run
the test. Add support for test boot arguments to mkinfo.py.

Signed-off-by: Denis Mukhin <dmukhin@xxxxxxxx>
---
 build/gen.mk    | 2 +-
 build/mkinfo.py | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/gen.mk b/build/gen.mk
index 8c400e6595e9..999c2e0dddc6 100644
--- a/build/gen.mk
+++ b/build/gen.mk
@@ -36,7 +36,7 @@ build: $(foreach env,$(TEST-ENVS),test-$(env)-$(NAME)) 
$(TEST-CFGS)
 build: info.json
 
 info.json: $(ROOT)/build/mkinfo.py Makefile
-       $(PYTHON) $< $@ "$(NAME)" "$(CATEGORY)" "$(TEST-ENVS)" "$(VARY-CFG)"
+       $(PYTHON) $< $@ "$(NAME)" "$(CATEGORY)" "$(TEST-ENVS)" "$(VARY-CFG)" 
"$(firstword $(wildcard $(1).bootargs.in bootargs.in))"
 
 .PHONY: install install-each-env
 install: install-each-env info.json
diff --git a/build/mkinfo.py b/build/mkinfo.py
index 30f99832711f..f1c70f3c444a 100755
--- a/build/mkinfo.py
+++ b/build/mkinfo.py
@@ -2,15 +2,17 @@
 # -*- coding: utf-8 -*-
 import json
 import sys
+import os
 
 # Usage: mkcfg.py $OUT $NAME $CATEGORY $ENVS $VARIATIONS
-_, out, name, cat, envs, variations = sys.argv
+_, out, name, cat, envs, variations, bootargs = sys.argv
 
 template = {
     "name": name,
     "category": cat,
-    "environments": [],
-    "variations": [],
+    "environments": envs.replace('"', '').split(),
+    "variations": variations.replace('"', '').split(),
+    "xen,xen-bootargs": open(bootargs).read().strip() if 
os.path.exists(bootargs) else "",
     }
 
 if envs:
-- 
2.55.0