diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-02-26 22:37:12 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-02-26 22:37:12 +0100 |
| commit | 93be4e8e6c6b82a5825b56cce991563bf19aaaf2 (patch) | |
| tree | 2b48c1c88f046ee6e1d59636d1f6e8fbbd1660c2 /tests/builders.scm | |
| parent | a068dba78bde9c83a69c755df1131c286d065850 (diff) | |
| parent | e1509174957bd9eba777bec86ea290fb44a4bce3 (diff) | |
| download | patches-93be4e8e6c6b82a5825b56cce991563bf19aaaf2.tar patches-93be4e8e6c6b82a5825b56cce991563bf19aaaf2.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/builders.scm')
| -rw-r--r-- | tests/builders.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/builders.scm b/tests/builders.scm index e5acc3e038..a7c3e42830 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -56,16 +56,13 @@ (package-native-search-paths package))) (@@ (gnu packages commencement) %boot0-inputs))) -(define network-reachable? - (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV))) - (define url-fetch* (store-lower url-fetch)) (test-begin "builders") -(unless network-reachable? (test-skip 1)) +(unless (network-reachable?) (test-skip 1)) (test-assert "url-fetch" (let* ((url '("http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz" "ftp://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz")) @@ -97,7 +94,8 @@ (test-assert "gnu-build-system" (build-system? gnu-build-system)) -(unless network-reachable? (test-skip 1)) +(when (or (not (network-reachable?)) (shebang-too-long?)) + (test-skip 1)) (test-assert "gnu-build" (let* ((url "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz") (hash (nix-base32-string->bytevector |