From owner-p4-projects@FreeBSD.ORG Fri Nov 7 04:06:22 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE2678C3; Fri, 7 Nov 2014 04:06:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85D0E8C1 for ; Fri, 7 Nov 2014 04:06:21 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F45D111 for ; Fri, 7 Nov 2014 04:06:21 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sA746L9h067818 for ; Fri, 7 Nov 2014 04:06:21 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sA746L28067815 for perforce@freebsd.org; Fri, 7 Nov 2014 04:06:21 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Nov 2014 04:06:21 GMT Message-Id: <201411070406.sA746L28067815@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1202597 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 04:06:22 -0000 http://p4web.freebsd.org/@@1202597?ac=10 Change 1202597 by jmg@jmg_carbon2 on 2014/11/07 04:05:32 fix the test... I need to cd into the script dir so that I can locate the program... It'd be nice to get better errors... The standard log doesn't appear to contain stderr... Move all the data files into the current directory.. This allows us to still run the tests here, and this is what other tests are doing... Sponsored by: FreeBSD Foundation Sponsored by: Netgate Affected files ... .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCGFSbox128.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCGFSbox192.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCGFSbox256.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCKeySbox128.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCKeySbox192.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCKeySbox256.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCVarKey128.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCVarKey192.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCVarKey256.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCVarTxt128.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCVarTxt192.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/CBCVarTxt256.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/HMAC.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/Makefile#3 edit .. //depot/projects/opencrypto/tests/sys/opencrypto/TCBCinvperm.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/TCBCpermop.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/TCBCsubtab.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/TCBCvarkey.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/TCBCvartext.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/XTSGenAES128.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/XTSGenAES256.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/cryptotest.py#3 edit .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCGFSbox128.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCGFSbox192.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCGFSbox256.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCKeySbox128.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCKeySbox192.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCKeySbox256.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCVarKey128.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCVarKey192.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCVarKey256.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCVarTxt128.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCVarTxt192.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/CBCVarTxt256.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/HMAC.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/TCBCinvperm.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/TCBCpermop.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/TCBCsubtab.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/TCBCvarkey.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/TCBCvartext.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/XTSGenAES128.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/XTSGenAES256.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/gcmDecrypt128.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/gcmDecrypt192.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/gcmDecrypt256.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/gcmEncryptExtIV128.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/gcmEncryptExtIV192.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/data/gcmEncryptExtIV256.rsp#2 delete .. //depot/projects/opencrypto/tests/sys/opencrypto/gcmDecrypt128.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/gcmDecrypt192.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/gcmDecrypt256.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/gcmEncryptExtIV128.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/gcmEncryptExtIV192.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/gcmEncryptExtIV256.rsp#1 branch .. //depot/projects/opencrypto/tests/sys/opencrypto/runtests.sh#2 edit Differences ... ==== //depot/projects/opencrypto/tests/sys/opencrypto/Makefile#3 (text+ko) ==== @@ -1,7 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/data - TESTSDIR= ${TESTSBASE}/sys/opencrypto BINDIR= ${TESTSDIR} ==== //depot/projects/opencrypto/tests/sys/opencrypto/cryptotest.py#3 (text+ko) ==== @@ -23,18 +23,18 @@ ############### @unittest.skipIf(cname not in aesmodules, 'skipping AES on %s' % `cname`) def test_xts(self): - for i in iglob('data/XTS*.rsp'): + for i in iglob('XTS*.rsp'): self.runXTS(i, cryptodev.CRYPTO_AES_XTS) def test_cbc(self): - for i in iglob('data/CBC[GKV]*.rsp'): + for i in iglob('CBC[GKV]*.rsp'): self.runCBC(i) def test_gcm(self): - for i in iglob('data/gcmEncrypt*'): + for i in iglob('gcmEncrypt*'): self.runGCM(i, 'ENCRYPT') - for i in iglob('data/gcmDecrypt*'): + for i in iglob('gcmDecrypt*'): self.runGCM(i, 'DECRYPT') _gmacsizes = { 32: cryptodev.CRYPTO_AES_256_NIST_GMAC, @@ -158,7 +158,7 @@ ############### @unittest.skipIf(cname not in desmodules, 'skipping DES on %s' % `cname`) def test_tdes(self): - for i in iglob('data/TCBC[a-z]*.rsp'): + for i in iglob('TCBC[a-z]*.rsp'): self.runTDES(i) def runTDES(self, fname): @@ -196,11 +196,11 @@ def test_sha(self): # SHA not available in software pass - #for i in iglob('data/SHA1*'): + #for i in iglob('SHA1*'): # self.runSHA(i) def test_sha1hmac(self): - self.runSHA1HMAC('data/HMAC.rsp') + self.runSHA1HMAC('HMAC.rsp') def runSHA1HMAC(self, fname): for bogusmode, lines in cryptodev.KATParser(fname, ==== //depot/projects/opencrypto/tests/sys/opencrypto/runtests.sh#2 (text+ko) ==== @@ -14,6 +14,7 @@ oldcdas=$(sysctl -e kern.cryptodevallowsoft) sysctl kern.cryptodevallowsoft=1 +cd "$(dirname "$0")" python cryptotest.py sysctl "$oldcdas"