Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 May 2017 23:19:32 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r319008 - head/lib/libkvm/tests
Message-ID:  <201705272319.v4RNJWuZ061396@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sat May 27 23:19:32 2017
New Revision: 319008
URL: https://svnweb.freebsd.org/changeset/base/319008

Log:
  kvm_geterr_test: Compile out the portions that require kvm_open2(3) on
  systems that lack the libcall, based on __FreeBSD_version.
  
  kvm_open2(3) wasn't made available until r291406, which is in ^/stable/11,
  but not ^/stable/10. This makes some of kvm_geterr_test available for testing
  on ^/stable/10.
  
  MFC after:	now
  Sponsored by:	Dell EMC Isilon

Modified:
  head/lib/libkvm/tests/kvm_geterr_test.c

Modified: head/lib/libkvm/tests/kvm_geterr_test.c
==============================================================================
--- head/lib/libkvm/tests/kvm_geterr_test.c	Sat May 27 23:04:48 2017	(r319007)
+++ head/lib/libkvm/tests/kvm_geterr_test.c	Sat May 27 23:19:32 2017	(r319008)
@@ -65,6 +65,8 @@ ATF_TC_HEAD(kvm_geterr_positive_test_err
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
+/* 1100090 was where kvm_open2(3) was introduced. */
+#if __FreeBSD_version >= 1100091
 ATF_TC_BODY(kvm_geterr_positive_test_error, tc)
 {
 	kvm_t *kd;
@@ -125,13 +127,16 @@ ATF_TC_BODY(kvm_geterr_positive_test_no_
 	ATF_REQUIRE_MSG(kvm_close(kd) == 0, "kvm_close failed: %s",
 	    strerror(errno));
 }
+#endif
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, kvm_geterr_negative_test_NULL);
+#if __FreeBSD_version >= 1100091
 	ATF_TP_ADD_TC(tp, kvm_geterr_positive_test_error);
 	ATF_TP_ADD_TC(tp, kvm_geterr_positive_test_no_error);
+#endif
 
 	return (atf_no_error());
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705272319.v4RNJWuZ061396>