[Guile-commits] 10/13: skip version test if git-version-gen can't compute version from git

[Mike Gran]

mike121 pushed a commit to branch master
in repository guile.

commit efecac1c7de740cc96505d4cc906654374ffb372
Author: Michael Gran <spk121@yahoo.com>
AuthorDate: Mon Dec 28 14:53:07 2020 -0800

    skip version test if git-version-gen can't compute version from git
    
    This might occur due to a shallow git clone.
    
    * test-suite/tests/version.test: throw unsupported if version is unknown
---
 test-suite/tests/version.test | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/test-suite/tests/version.test b/test-suite/tests/version.test
index c1ce395..7ea358d 100644
--- a/test-suite/tests/version.test
+++ b/test-suite/tests/version.test
@@ -1,18 +1,18 @@
 ;;;; version.test --- test suite for Guile's version functions  -*- scheme -*-
 ;;;; Greg J. Badros <gjb@cs.washington.edu>
 ;;;;
-;;;;   Copyright (C) 2000, 2001, 2006, 2010 Free Software Foundation, Inc.
-;;;; 
+;;;;   Copyright (C) 2000,2001,2006,2010,2020 Free Software Foundation, Inc.
+;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
+;;;;
 ;;;; You should have received a copy of the GNU Lesser General Public
 ;;;; License along with this library; if not, write to the Free Software
 ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
@@ -21,10 +21,12 @@
   #:use-module (test-suite lib))
 
 (pass-if "version reporting works"
-        (and (string? (major-version))
-             (string? (minor-version))
-             (string? (micro-version))
-             (string-contains (version)
-                               (string-append (major-version) "."
-                                              (minor-version) "."
-                                              (micro-version)))))
+  (if (string-contains (version) "UNKNOWN")
+      (throw 'unsupported)
+      (and (string? (major-version))
+          (string? (minor-version))
+          (string? (micro-version))
+          (string-contains (version)
+                            (string-append (major-version) "."
+                                           (minor-version) "."
+                                           (micro-version))))))