tests: Add -V test for all binaries

NOTE: we cannot use cmd.name(), because it requires meson 0.54.0.

Closes: #361

Signed-off-by: Petr Vorel <pvorel@suse.cz>

9 files changed, 68 insertions, 14 deletions

diff --git a/meson.build b/meson.build
index 8f99d34..2445df4 100644
--- a/meson.build
+++ b/meson.build
@@ -243,14 +243,14 @@ if build_ping == true
 endif
 
 if build_tracepath == true
-	executable('tracepath', ['tracepath.c', git_version_h],
+	tracepath = executable('tracepath', ['tracepath.c', git_version_h],
 		dependencies : [idn_dep, intl_dep],
 		link_with : [libcommon],
 		install: true)
 endif
 
 if build_clockdiff == true
-	executable('clockdiff', ['clockdiff.c', git_version_h],
+	clockdiff = executable('clockdiff', ['clockdiff.c', git_version_h],
 		dependencies : [cap_dep, intl_dep],
 		link_with : [libcommon],
 		install: true)
@@ -265,7 +265,7 @@ if build_clockdiff == true
 endif
 
 if build_rdisc == true
-	executable('rdisc', ['rdisc.c', git_version_h],
+	rdisc = executable('rdisc', ['rdisc.c', git_version_h],
 		install_dir: sbindir,
 		link_with : [libcommon],
 		install: true)
@@ -290,7 +290,7 @@ if build_rdisc == true
 endif
 
 if build_arping == true
-	executable('arping', ['arping.c', git_version_h],
+	arping = executable('arping', ['arping.c', git_version_h],
 		dependencies : [rt_dep, cap_dep, idn_dep, intl_dep],
 		link_with : [libcommon],
 		install: true)
@@ -309,7 +309,7 @@ if build_tftpd == true
 endif
 
 if build_rarpd == true
-	executable('rarpd', ['rarpd.c', git_version_h],
+	rarpd = executable('rarpd', ['rarpd.c', git_version_h],
 		install_dir: sbindir,
 		link_with : [libcommon],
 		install: true)
diff --git a/ninfod/meson.build b/ninfod/meson.build
index cf33c06..36ffcdc 100644
--- a/ninfod/meson.build
+++ b/ninfod/meson.build
@@ -11,7 +11,7 @@ ninfod_sources = files('''
 	ninfod_core.c
 	ninfod_name.c
 '''.split())
-executable('ninfod', [ninfod_sources, git_version_h],
+ninfod = executable('ninfod', [ninfod_sources, git_version_h],
 	dependencies : [cap_dep, rt_dep, threads],
 	link_with : [libcommon],
 	include_directories : inc,
diff --git a/test/arping/meson.build b/test/arping/meson.build
new file mode 100644
index 0000000..7f381b3
--- /dev/null
+++ b/test/arping/meson.build
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
+
+cmd = arping
+cmd_name = 'arping '
+args = ['-V']
+
+name = cmd_name + ' '.join(args)
+test(name, cmd, args : args)
diff --git a/test/clockdiff/meson.build b/test/clockdiff/meson.build
new file mode 100644
index 0000000..227bbe4
--- /dev/null
+++ b/test/clockdiff/meson.build
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
+
+cmd = clockdiff
+cmd_name = 'clockdiff '
+args = ['-V']
+
+name = cmd_name + ' '.join(args)
+test(name, cmd, args : args)
diff --git a/test/meson.build b/test/meson.build
index b6ad639..14dcb4a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1 +1,8 @@
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
+
+subdir('arping')
+subdir('clockdiff')
+subdir('ninfod')
 subdir('ping')
+subdir('rarpd')
+subdir('tracepath')
diff --git a/test/ninfod/meson.build b/test/ninfod/meson.build
new file mode 100644
index 0000000..9180294
--- /dev/null
+++ b/test/ninfod/meson.build
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
+
+cmd = ninfod
+cmd_name = 'ninfod '
+args = ['-V']
+
+name = cmd_name + ' '.join(args)
+test(name, cmd, args : args)
diff --git a/test/ping/meson.build b/test/ping/meson.build
index 4535f72..11f15f5 100644
--- a/test/ping/meson.build
+++ b/test/ping/meson.build
@@ -23,6 +23,13 @@ else
   message('running as normal user')
 endif
 
+cmd = ping
+cmd_name = 'ping '
+args = ['-V']
+
+name = 'ping ' + ' '.join(args)
+test(name, ping, args : args)
+
 foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
   foreach switch : [ '', '-4' ] + ipv6_switch
 	args = [ '-c1', dst ]
@@ -35,8 +42,8 @@ foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst
 	  endif
 	endif
 
-	name = 'ping ' + ' '.join(args)
-	test(name, ping, args : args, should_fail : should_fail)
+	name = cmd_name + ' '.join(args)
+	test(name, cmd, args : args, should_fail : should_fail)
   endforeach
 endforeach
 
@@ -51,8 +58,8 @@ ping_tests_opt = [
 foreach dst : [ '127.0.0.1' ] + ipv6_dst
   foreach args : ping_tests_opt
 	args += [ dst ]
-	name = 'ping ' + ' '.join(args)
-	test(name, ping, args : args)
+	name = cmd_name + ' '.join(args)
+	test(name, cmd, args : args)
   endforeach
 endforeach
 
@@ -65,8 +72,8 @@ ping_tests_opt_fail = [
 foreach dst : [ '127.0.0.1' ] + ipv6_dst
   foreach args : ping_tests_opt_fail
 	args += [ dst ]
-	name = 'ping ' + ' '.join(args)
-	test(name, ping, args : args, should_fail : true)
+	name = cmd_name + ' '.join(args)
+	test(name, cmd, args : args, should_fail : true)
   endforeach
 endforeach
 
@@ -76,7 +83,7 @@ ping_tests_user_fail = [
 foreach dst : [ '127.0.0.1' ] + ipv6_dst
   foreach args : ping_tests_user_fail
 	args += [ dst ]
-	name = 'ping ' + ' '.join(args)
-	test(name, ping, args : args, should_fail : not run_as_root)
+	name = cmd_name + ' '.join(args)
+	test(name, cmd, args : args, should_fail : not run_as_root)
   endforeach
 endforeach
diff --git a/test/rarpd/meson.build b/test/rarpd/meson.build
new file mode 100644
index 0000000..6a7437e
--- /dev/null
+++ b/test/rarpd/meson.build
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
+
+cmd = rarpd
+cmd_name = 'rarpd '
+args = ['-V']
+
+name = cmd_name + ' '.join(args)
+test(name, cmd, args : args)
diff --git a/test/tracepath/meson.build b/test/tracepath/meson.build
new file mode 100644
index 0000000..8f3948a
--- /dev/null
+++ b/test/tracepath/meson.build
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
+
+cmd = tracepath
+cmd_name = 'tracepath '
+args = ['-V']
+
+name = cmd_name + ' '.join(args)
+test(name, cmd, args : args)