Rename test-info.json to just info.json

There are enough files starting with test.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/.gitignore b/.gitignore
index 56e1884ad0ae4dbebf28a62124fc43151a263bed..f69e7fc05410110e8bbac0ecd0bac2c2558c6848 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /docs/autogenerated/
 /selftests/test-*
 /tests/*/test-*
+/tests/*/info.json

diff --git a/Makefile b/Makefile
index 8c36da0305f3fbedf07b22690559e66bc7715d85..17d784ec73604cb8cf8cd1591fbbe0fca09c8693 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ cscope:
 clean:
        find . \( -name "*.o" -o -name "*.d" -o -name "*.lds" \) -delete
        find tests/ \( -perm -a=x -name "test-*" -o -name "test-*.cfg" \
-               -o -name "test-info.json" \) -delete
+               -o -name "info.json" \) -delete
 
 .PHONY: distclean
 distclean: clean

diff --git a/build/gen.mk b/build/gen.mk
index 6d3db2f60a033037e118d0a44db23f08d9a3a69e..f33738be98c413cee6b3bd6d99f34ff439988337 100644 (file)
--- a/build/gen.mk
+++ b/build/gen.mk
@@ -23,16 +23,16 @@ endif
 
 .PHONY: build
 build: $(foreach env,$(TEST-ENVS),test-$(env)-$(NAME) test-$(env)-$(NAME).cfg)
-build: test-info.json
+build: info.json
 
-test-info.json: $(ROOT)/build/mkinfo.py FORCE
+info.json: $(ROOT)/build/mkinfo.py FORCE
        @$(PYTHON) $< $@.tmp "$(NAME)" "$(CATEGORY)" "$(TEST-ENVS)"
        @$(call move-if-changed,$@.tmp,$@)
 
 .PHONY: install install-each-env
-install: install-each-env test-info.json
+install: install-each-env info.json
        @$(INSTALL_DIR) $(DESTDIR)$(xtftestdir)/$(NAME)
-       $(INSTALL_DATA) test-info.json $(DESTDIR)$(xtftestdir)/$(NAME)
+       $(INSTALL_DATA) info.json $(DESTDIR)$(xtftestdir)/$(NAME)
 
 define PERENV_build
 

diff --git a/docs/introduction.dox b/docs/introduction.dox
index 3151fbf555c524db2aa28850dce68cce8ea6ab73..34f472c1f9c6c1d516ea561fe71049113df60ecf 100644 (file)
--- a/docs/introduction.dox
+++ b/docs/introduction.dox
@@ -90,6 +90,7 @@ Building this will generate a number of files.
     $ make -j4
     ... <snip>
     $ ls tests/example/
+    info.json
     main.c
     main-hvm32.d
     main-hvm32.o
@@ -112,7 +113,6 @@ Building this will generate a number of files.
     test-hvm32pse-example.cfg
     test-hvm64-example
     test-hvm64-example.cfg
-    test-info.json
     test-pv32pae-example
     test-pv32pae-example.cfg
     test-pv64-example
@@ -120,7 +120,7 @@ Building this will generate a number of files.
 
 The `.o` and `.d` files are build artefacts, leading to the eventual
 `test-$ENV-$NAME` microkernel.  Individual `xl.cfg` files are generated for
-each microkernel.  `test-info.json` contains metadata about the test.
+each microkernel.  `info.json` contains metadata about the test.
 
 
 @section install Installing

diff --git a/xtf-runner b/xtf-runner
index 66b2fb711067dc8e3ac72a680f0f5e5649fc9f24..7c38db89bcecc5a78c8931840c0143a6a809686c 100755 (executable)
--- a/xtf-runner
+++ b/xtf-runner
@@ -42,7 +42,7 @@ class RunnerError(Exception):
     """ Errors relating to xtf-runner itself """
 
 def open_test_info():
-    """ Open and collate each test-info.json """
+    """ Open and collate each info.json """
 
     info = {}
 
@@ -52,9 +52,9 @@ def open_test_info():
         test_json = {}
         try:
 
-            # Ignore directories which don't have a test-info.json inside them
+            # Ignore directories which don't have a info.json inside them
             try:
-                test_info = open(path.join("tests", test, "test-info.json"))
+                test_info = open(path.join("tests", test, "info.json"))
             except IOError:
                 continue