[master] a65c99a Remove the "feature term" test now that we use TERM=xterm

Poul-Henning Kamp phk at FreeBSD.org
Thu Apr 5 07:34:09 UTC 2018


commit a65c99a585e014465d7e3c728fc083ae42358524
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Apr 5 07:32:41 2018 +0000

    Remove the "feature term" test now that we use TERM=xterm

diff --git a/bin/varnishtest/tests/u00008.vtc b/bin/varnishtest/tests/u00008.vtc
index 8a88ad7..052a1c9 100644
--- a/bin/varnishtest/tests/u00008.vtc
+++ b/bin/varnishtest/tests/u00008.vtc
@@ -1,7 +1,5 @@
 varnishtest	"trivial run of varnistat in curses mode"
 
-feature term
-
 server s1 -repeat 4 {
 	rxreq
 	txresp
diff --git a/bin/varnishtest/tests/u00009.vtc b/bin/varnishtest/tests/u00009.vtc
index 89e6ea7..5825179 100644
--- a/bin/varnishtest/tests/u00009.vtc
+++ b/bin/varnishtest/tests/u00009.vtc
@@ -1,7 +1,5 @@
 varnishtest	"trivial run of varnishhist in curses mode"
 
-feature term
-
 server s1 {
 	rxreq
 	txresp
diff --git a/bin/varnishtest/tests/u00010.vtc b/bin/varnishtest/tests/u00010.vtc
index a143c72..009199d 100644
--- a/bin/varnishtest/tests/u00010.vtc
+++ b/bin/varnishtest/tests/u00010.vtc
@@ -1,7 +1,5 @@
 varnishtest	"trivial run of varnishtop in curses mode"
 
-feature term
-
 server s1 {
 	rxreq
 	txresp
diff --git a/bin/varnishtest/tests/u00011.vtc b/bin/varnishtest/tests/u00011.vtc
index 90fcfe2..c1a6008 100644
--- a/bin/varnishtest/tests/u00011.vtc
+++ b/bin/varnishtest/tests/u00011.vtc
@@ -1,7 +1,5 @@
 varnishtest	"trivial run of varnishadm in curses mode"
 
-feature term
-
 server s1 {
 	rxreq
 	txresp
diff --git a/bin/varnishtest/tests/u00012.vtc b/bin/varnishtest/tests/u00012.vtc
index 0660d07..5fb9b35 100644
--- a/bin/varnishtest/tests/u00012.vtc
+++ b/bin/varnishtest/tests/u00012.vtc
@@ -1,7 +1,5 @@
 varnishtest	"trivial run of varnishadm in pass mode"
 
-feature term
-
 server s1 {
 	rxreq
 	txresp
diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c
index 06b0167..8ffe696 100644
--- a/bin/varnishtest/vtc_misc.c
+++ b/bin/varnishtest/vtc_misc.c
@@ -341,8 +341,6 @@ cmd_delay(CMD_ARGS)
  * ignore_unknown_macro
  *        Do not fail the test if a string of the form ${...} is not
  *        recognized as a macro.
- * term
- *        Support for ansi.sys terminal
  *
  * persistent_storage
  *        Varnish was built with the deprecated persistent storage.
@@ -358,23 +356,6 @@ static const unsigned with_persistent_storage = 1;
 static const unsigned with_persistent_storage = 0;
 #endif
 
-static int
-test_term(struct vtclog *vl)
-{
-	FILE *p;
-	int a, b;
-
-	p = popen("tput -T ansi.sys clear 2>&1", "r");
-	if (p == NULL)
-		return (0);
-	a = fgetc(p);
-	b = fgetc(p);
-	if (a == 0x1b && b == '[')
-		return (1);
-	vtc_log(vl, 3, "No 'ansi.sys' terminfo entry.");
-	return (0);
-}
-
 void v_matchproto_(cmd_f)
 cmd_feature(CMD_ARGS)
 {
@@ -423,7 +404,6 @@ cmd_feature(CMD_ARGS)
 		FEATURE("user_varnish", getpwnam("varnish") != NULL);
 		FEATURE("user_vcache", getpwnam("vcache") != NULL);
 		FEATURE("group_varnish", getgrnam("varnish") != NULL);
-		FEATURE("term", test_term(vl));
 		FEATURE("persistent_storage", with_persistent_storage);
 
 		if (!strcmp(*av, "disable_aslr")) {


More information about the varnish-commit mailing list