Merge pull request #2647 from yahoo/toregge/rename-vespa-header-inspect-to-vespa-fileheader-inspect

Rename vespa-header-inspect to vespa-fileheader-inspect.

11 files changed, 25 insertions, 25 deletions

diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 7a340e7800e..b9e0a8f8943 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -58,10 +58,10 @@ vespa_define_module(
 
     APPS
     src/apps/docstore
-    src/apps/fileheaderinspect
     src/apps/tests
     src/apps/uniform
     src/apps/vespa-attribute-inspect
+    src/apps/vespa-fileheader-inspect
     src/apps/vespa-index-inspect
     src/apps/vespa-ranking-expression-analyzer
 
@@ -155,7 +155,6 @@ vespa_define_module(
     src/tests/fef/table
     src/tests/fef/termfieldmodel
     src/tests/fef/termmatchdatamerger
-    src/tests/fileheaderinspect
     src/tests/fileheadertk
     src/tests/forcelink
     src/tests/grouping
@@ -220,4 +219,5 @@ vespa_define_module(
     src/tests/util/slime_output_raw_buf_adapter
     src/tests/util/statebuf
     src/tests/util/statefile
+    src/tests/vespa-fileheader-inspect
 )
diff --git a/searchlib/src/apps/fileheaderinspect/.gitignore b/searchlib/src/apps/fileheaderinspect/.gitignore
deleted file mode 100644
index 5616f8e735c..00000000000
--- a/searchlib/src/apps/fileheaderinspect/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.depend
-Makefile
-vespa-header-inspect
diff --git a/searchlib/src/apps/vespa-fileheader-inspect/.gitignore b/searchlib/src/apps/vespa-fileheader-inspect/.gitignore
new file mode 100644
index 00000000000..5b53dd5e3ac
--- /dev/null
+++ b/searchlib/src/apps/vespa-fileheader-inspect/.gitignore
@@ -0,0 +1,3 @@
+.depend
+Makefile
+vespa-fileheader-inspect
diff --git a/searchlib/src/apps/fileheaderinspect/CMakeLists.txt b/searchlib/src/apps/vespa-fileheader-inspect/CMakeLists.txt
index 322bf6fefcb..cbbe8c05c2b 100644
--- a/searchlib/src/apps/fileheaderinspect/CMakeLists.txt
+++ b/searchlib/src/apps/vespa-fileheader-inspect/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_vespa-header-inspect_app
+vespa_add_executable(searchlib_vespa-fileheader-inspect_app
     SOURCES
-    fileheaderinspect.cpp
-    OUTPUT_NAME vespa-header-inspect
+    vespa-fileheader-inspect.cpp
+    OUTPUT_NAME vespa-fileheader-inspect
     INSTALL bin
     DEPENDS
     searchlib
diff --git a/searchlib/src/apps/fileheaderinspect/fileheaderinspect.cpp b/searchlib/src/apps/vespa-fileheader-inspect/vespa-fileheader-inspect.cpp
index 2407be0b4c2..02cbb230960 100644
--- a/searchlib/src/apps/fileheaderinspect/fileheaderinspect.cpp
+++ b/searchlib/src/apps/vespa-fileheader-inspect/vespa-fileheader-inspect.cpp
@@ -7,7 +7,7 @@
 #include <vespa/vespalib/data/fileheader.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/log/log.h>
-LOG_SETUP("fileheaderinspect");
+LOG_SETUP("vespa-fileheader-inspect");
 
 using namespace vespalib;
 
diff --git a/searchlib/src/tests/fileheaderinspect/CMakeLists.txt b/searchlib/src/tests/fileheaderinspect/CMakeLists.txt
deleted file mode 100644
index 4bc15f90ea7..00000000000
--- a/searchlib/src/tests/fileheaderinspect/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_fileheaderinspect_test_app TEST
-    SOURCES
-    fileheaderinspect.cpp
-    DEPENDS
-    searchlib
-    AFTER
-    searchlib_vespa-header-inspect_app
-)
-vespa_add_test(NAME searchlib_fileheaderinspect_test_app COMMAND searchlib_fileheaderinspect_test_app)
diff --git a/searchlib/src/tests/fileheaderinspect/.gitignore b/searchlib/src/tests/vespa-fileheader-inspect/.gitignore
index 812991d07b5..4ff47722dca 100644
--- a/searchlib/src/tests/fileheaderinspect/.gitignore
+++ b/searchlib/src/tests/vespa-fileheader-inspect/.gitignore
@@ -3,4 +3,4 @@ Makefile
 fileheader.dat
 fileheaderinspect_test
 out
-searchlib_fileheaderinspect_test_app
+searchlib_vespa-fileheader-inspect_test_app
diff --git a/searchlib/src/tests/vespa-fileheader-inspect/CMakeLists.txt b/searchlib/src/tests/vespa-fileheader-inspect/CMakeLists.txt
new file mode 100644
index 00000000000..14bf5a82e3f
--- /dev/null
+++ b/searchlib/src/tests/vespa-fileheader-inspect/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchlib_vespa-fileheader-inspect_test_app TEST
+    SOURCES
+    vespa-fileheader-inspect_test.cpp
+    DEPENDS
+    searchlib
+    AFTER
+    searchlib_vespa-fileheader-inspect_app
+)
+vespa_add_test(NAME searchlib_vespa-fileheader-inspect_test_app COMMAND searchlib_vespa-fileheader-inspect_test_app)
diff --git a/searchlib/src/tests/fileheaderinspect/DESC b/searchlib/src/tests/vespa-fileheader-inspect/DESC
index ee57a2fdde3..ee57a2fdde3 100644
--- a/searchlib/src/tests/fileheaderinspect/DESC
+++ b/searchlib/src/tests/vespa-fileheader-inspect/DESC
diff --git a/searchlib/src/tests/fileheaderinspect/FILES b/searchlib/src/tests/vespa-fileheader-inspect/FILES
index 7c32fb811d5..7c32fb811d5 100644
--- a/searchlib/src/tests/fileheaderinspect/FILES
+++ b/searchlib/src/tests/vespa-fileheader-inspect/FILES
diff --git a/searchlib/src/tests/fileheaderinspect/fileheaderinspect.cpp b/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp
index 68bae5e57d8..b54b06e4d93 100644
--- a/searchlib/src/tests/fileheaderinspect/fileheaderinspect.cpp
+++ b/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp
@@ -34,14 +34,14 @@ vespalib::string readFile(const vespalib::string &fileName) {
 }
 
 TEST("testError") {
-    EXPECT_TRUE(system("../../apps/fileheaderinspect/vespa-header-inspect notfound.dat") != 0);
+    EXPECT_TRUE(system("../../apps/vespa-fileheader-inspect/vespa-fileheader-inspect notfound.dat") != 0);
 }
 
 TEST("testEscape") {
     FileHeader header;
     header.putTag(FileHeader::Tag("fanart", "\fa\na\r\t"));
     ASSERT_TRUE(writeHeader(header, "fileheader.dat"));
-    EXPECT_TRUE(system("../../apps/fileheaderinspect/vespa-header-inspect -q fileheader.dat > out") == 0);
+    EXPECT_TRUE(system("../../apps/vespa-fileheader-inspect/vespa-fileheader-inspect -q fileheader.dat > out") == 0);
     EXPECT_EQUAL("fanart;string;\\fa\\na\\r\\t\n", readFile("out"));
 }
 
@@ -49,7 +49,7 @@ TEST("testDelimiter") {
     FileHeader header;
     header.putTag(FileHeader::Tag("string", "string"));
     ASSERT_TRUE(writeHeader(header, "fileheader.dat"));
-    EXPECT_TRUE(system("../../apps/fileheaderinspect/vespa-header-inspect -d i -q fileheader.dat > out") == 0);
+    EXPECT_TRUE(system("../../apps/vespa-fileheader-inspect/vespa-fileheader-inspect -d i -q fileheader.dat > out") == 0);
     EXPECT_EQUAL("str\\ingistr\\ingistr\\ing\n", readFile("out"));
 }
 
@@ -57,7 +57,7 @@ TEST("testQuiet") {
     FileHeader header;
     FileHeaderTk::addVersionTags(header);
     ASSERT_TRUE(writeHeader(header, "fileheader.dat"));
-    EXPECT_TRUE(system("../../apps/fileheaderinspect/vespa-header-inspect -q fileheader.dat > out") == 0);
+    EXPECT_TRUE(system("../../apps/vespa-fileheader-inspect/vespa-fileheader-inspect -q fileheader.dat > out") == 0);
     vespalib::string str = readFile("out");
     EXPECT_TRUE(!str.empty());
     for (uint32_t i = 0, numTags = header.getNumTags(); i < numTags; ++i) {
@@ -75,7 +75,7 @@ TEST("testVerbose") {
     FileHeader header;
     FileHeaderTk::addVersionTags(header);
     ASSERT_TRUE(writeHeader(header, "fileheader.dat"));
-    EXPECT_TRUE(system("../../apps/fileheaderinspect/vespa-header-inspect fileheader.dat > out") == 0);
+    EXPECT_TRUE(system("../../apps/vespa-fileheader-inspect/vespa-fileheader-inspect fileheader.dat > out") == 0);
     vespalib::string str = readFile("out");
     EXPECT_TRUE(!str.empty());
     for (uint32_t i = 0, numTags = header.getNumTags(); i < numTags; ++i) {