Add a --version option to cec-compliance to retrieve the version of
cec-compliance. While at it, factor out printing the SHA.
Signed-off-by: Paul Elder <paul.elder@xxxxxxxxxxxxxxxx>
---
Changes in v5:
- update manpage
- move STR macros to before print_sha()
Changes in v4:
- add git commit count to version
Changes in v3:
- embed PACKAGE_VERSION instead of string concatenation
---
utils/cec-compliance/Makefile.am | 2 +-
utils/cec-compliance/cec-compliance.1.in | 3 +++
utils/cec-compliance/cec-compliance.cpp | 25 +++++++++++++++++++++---
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am
index 57ed7b37..a9c59ca6 100644
--- a/utils/cec-compliance/Makefile.am
+++ b/utils/cec-compliance/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = cec-compliance
man_MANS = cec-compliance.1
cec_compliance_SOURCES = cec-compliance.cpp cec-compliance.h cec-test.cpp cec-test-adapter.cpp cec-test-audio.cpp cec-test-power.cpp cec-test-fuzzing.cpp
-cec_compliance_CPPFLAGS = -I$(top_srcdir)/utils/libcecutil $(GIT_SHA)
+cec_compliance_CPPFLAGS = -I$(top_srcdir)/utils/libcecutil $(GIT_SHA) $(GIT_COMMIT_CNT)
cec_compliance_LDADD = -lrt ../libcecutil/libcecutil.la
EXTRA_DIST = cec-compliance.1
diff --git a/utils/cec-compliance/cec-compliance.1.in b/utils/cec-compliance/cec-compliance.1.in
index 3f9c7d8b..94654858 100644
--- a/utils/cec-compliance/cec-compliance.1.in
+++ b/utils/cec-compliance/cec-compliance.1.in
@@ -119,6 +119,9 @@ check that the test produced no warnings.
\fB\-v\fR, \fB\-\-verbose\fR
Turn on verbose reporting.
.TP
+\fB\-\-version\fR
+Show version information.
+.TP
\fB\-w\fR, \fB\-\-wall\-clock\fR
Show timestamps as wall-clock time. This also turns on verbose reporting.
.TP
diff --git a/utils/cec-compliance/cec-compliance.cpp b/utils/cec-compliance/cec-compliance.cpp
index bfd82af7..618e3160 100644
--- a/utils/cec-compliance/cec-compliance.cpp
+++ b/utils/cec-compliance/cec-compliance.cpp
@@ -93,6 +93,8 @@ enum Option {
OptSkipTestTunerControl,
OptSkipTestVendorSpecificCommands,
OptSkipTestStandbyResume,
+
+ OptVersion,
OptLast = 256
};
@@ -174,9 +176,23 @@ static struct option long_options[] = {
{"skip-test-tuner-control", no_argument, 0, OptSkipTestTunerControl},
{"skip-test-vendor-specific-commands", no_argument, 0, OptSkipTestVendorSpecificCommands},
{"skip-test-standby-resume", no_argument, 0, OptSkipTestStandbyResume},
+ {"version", no_argument, 0, OptVersion},
{0, 0, 0, 0}
};
+#define STR(x) #x
+#define STRING(x) STR(x)
+
+static void print_sha()
+{
+ printf("cec-compliance SHA : %s\n", STRING(GIT_SHA));
+}
+
+static void print_version()
+{
+ printf("cec-compliance %s%s\n", PACKAGE_VERSION, STRING(GIT_COMMIT_CNT));
+}
+
static void usage()
{
printf("Usage:\n"
@@ -231,6 +247,7 @@ static void usage()
" -s, --skip-info Skip Driver Info output\n"
" -T, --trace Trace all called ioctls\n"
" -v, --verbose Turn on verbose reporting\n"
+ " --version Show version information\n"
" -w, --wall-clock Show timestamps as wall-clock time (implies -v)\n"
" -W, --exit-on-warn Exit on the first warning.\n"
);
@@ -1258,6 +1275,10 @@ int main(int argc, char **argv)
case OptVerbose:
show_info = true;
break;
+ case OptVersion:
+ print_version();
+ print_sha();
+ std::exit(EXIT_SUCCESS);
case ':':
fprintf(stderr, "Option '%s' requires a value\n",
argv[optind]);
@@ -1392,9 +1413,7 @@ int main(int argc, char **argv)
if (options[OptInteractive])
test_tags |= TAG_INTERACTIVE;
-#define STR(x) #x
-#define STRING(x) STR(x)
- printf("cec-compliance SHA : %s\n", STRING(GIT_SHA));
+ print_sha();
node.phys_addr = CEC_PHYS_ADDR_INVALID;
doioctl(&node, CEC_ADAP_G_PHYS_ADDR, &node.phys_addr);
--
2.27.0
