From owner-dev-commits-src-main@freebsd.org Mon Sep 6 14:44:24 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2140A676495; Mon, 6 Sep 2021 14:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H3B4S0RrYz3pHy; Mon, 6 Sep 2021 14:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E337B206D7; Mon, 6 Sep 2021 14:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 186EiNqW073276; Mon, 6 Sep 2021 14:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 186EiNms073275; Mon, 6 Sep 2021 14:44:23 GMT (envelope-from git) Date: Mon, 6 Sep 2021 14:44:23 GMT Message-Id: <202109061444.186EiNms073275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: c6da134591a9 - main - iconv: Fix path names used by iconv(3) tests. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6da134591a9b5de7511e90128d8c20f5bbcc235 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 14:44:24 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=c6da134591a9b5de7511e90128d8c20f5bbcc235 commit c6da134591a9b5de7511e90128d8c20f5bbcc235 Author: Edward Tomasz Napierala AuthorDate: 2021-09-06 14:43:24 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-09-06 14:43:40 +0000 iconv: Fix path names used by iconv(3) tests. Reviewed By: allanjude Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D31815 --- tools/test/iconv/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/test/iconv/Makefile b/tools/test/iconv/Makefile index bdcec5dab201..3b74be06aac6 100644 --- a/tools/test/iconv/Makefile +++ b/tools/test/iconv/Makefile @@ -29,10 +29,10 @@ ENCODING+= ATARIST BIG5-2003 C99 CP1046 CP1124 CP1125 CP1129 CP1131 CP1133 \ # MACHEBREW .endif -GEN_FWD?= ${.CURDIR}/tablegen/tablegen -t -GEN_REV?= ${.CURDIR}/tablegen/tablegen -tr -REF_FWD?= ${.CURDIR}/refgen/refgen -t -REF_REV?= ${.CURDIR}/refgen/refgen -tr +GEN_FWD?= ${.OBJDIR}/tablegen/tablegen -t +GEN_REV?= ${.OBJDIR}/tablegen/tablegen -tr +REF_FWD?= ${.OBJDIR}/refgen/refgen -t +REF_REV?= ${.OBJDIR}/refgen/refgen -tr CMP?= ${.CURDIR}/tablegen/cmp.sh make-ref: refgen @@ -49,10 +49,10 @@ check: tablegen .for enc in ${ENCODING} @echo "Checking ${enc} --> UTF-32 ..." -@${GEN_FWD} ${enc} >output/${enc} - @${CMP} ref/${enc} output/${enc} + @${CMP} ${.CURDIR}/ref/${enc} ${.OBJDIR}/output/${enc} @echo "Checking UTF-32 --> ${enc} ..." -@${GEN_REV} ${enc} >output/${enc}-rev - @${CMP} ref/${enc}-rev output/${enc}-rev + @${CMP} ${.CURDIR}/ref/${enc}-rev ${.OBJDIR}/output/${enc}-rev .endfor perftest: refgen tablegen @@ -70,10 +70,10 @@ perftest: refgen tablegen .endfor posixtest: posix - @${.CURDIR}/posix/posix + @${.OBJDIR}/posix/posix gnutest: gnu - @${.CURDIR}/gnu/gnu + @${.OBJDIR}/gnu/gnu test-everything: check perftest posixtest gnutest