Use 'uname -m', which in practice returns the processor architecture. --- psm-3.3/buildflags.mak~ 2014-08-20 21:00:18.000000000 +0100 +++ psm-3.3/buildflags.mak 2017-10-22 12:02:12.855291447 +0100 @@ -38,7 +38,7 @@ endif export os ?= $(shell uname -s | tr '[A-Z]' '[a-z]') -export arch := $(shell uname -p | sed -e 's,\(i[456]86\|athlon$$\),i386,') +export arch := $(shell uname -m | sed -e 's,\(i[456]86\|athlon$$\),i386,') CC ?= gcc it.koszko.org/cgit-static/cgit.png' alt='cgit logo'/> index : guix
Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu/tests/ssh.scm
AgeCommit message (Expand)Author
2024-12-09tests: Adjust for new return value of ‘start-service’....In Shepherd 1.0, the “running value” of processes is no longer a plain integer; instead, it is a (process …) sexp. This commit adjusts tests to this change in a way that works both for 1.0 and for previous versions. * gnu/tests/databases.scm (run-memcached-test) (run-mysql-test): Don’t expect PID to be a number. * gnu/tests/docker.scm (run-docker-test) (run-docker-system-test, run-oci-container-test): Likewise. * gnu/tests/guix.scm (run-guix-build-coordinator-test) (run-guix-data-service-test, run-nar-herder-test) (run-bffe-test): Likewise. * gnu/tests/ldap.scm (run-ldap-test): Likewise. * gnu/tests/monitoring.scm (run-prometheus-node-exporter-server-test): Likewise. * gnu/tests/virtualization.scm (run-libvirt-test) (run-qemu-guest-agent-test, run-childhurd-test): Likewise. * gnu/tests/web.scm (run-webserver-test, run-php-fpm-test) (run-hpcguix-web-server-test, run-patchwork-test) (run-agate-test): Likewise * gnu/tests/ssh.scm (run-ssh-test): Accept a number, an ‘inetd-service’ sexp, or a ‘process’ sexp. Change-Id: I8c7a37a981f0788780fbc33752a38e7f9a026437 Ludovic Courtès