From owner-svn-src-head@FreeBSD.ORG Wed May 29 19:51:43 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C607FA99; Wed, 29 May 2013 19:51:43 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pb0-x22a.google.com (mail-pb0-x22a.google.com [IPv6:2607:f8b0:400e:c01::22a]) by mx1.freebsd.org (Postfix) with ESMTP id 91196393; Wed, 29 May 2013 19:51:43 +0000 (UTC) Received: by mail-pb0-f42.google.com with SMTP id uo1so9679766pbc.15 for ; Wed, 29 May 2013 12:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:x-mailer:from:subject:date :to; bh=Q/PLtYWLU90UeTusCaQzkxBHgU2f8oVhEVdyQURqOxM=; b=sn2JBKofCQ1O4rhiCgZmWP7+QBOB6pYdg2awPHsbqfbzoDKdbGRrrHa0N4YufPZaRD KEA3m/wDMTULmlDKd/fyyjJwrYsQ2EJLcI7FxGk7suhPoMR6K+GNI/lU6rzUD/wz7qlC osF4f0YNV8lCoSHjtxnVhk+Kmq2x+helh8qL6yrQ1sRvUwnKqwUfe6Ja7xlHT/oDl7Qu LD8e/MZENYTB3vpvtZYbrydlcXxXdg5IxBJHSEywljaYtJxgs2DjHtFtOPfdkGuAsh02 pW/hmm3qBP4NBwP9uWTG2H8QxVJO4te4o5k1lasC+NjVN65FS/Fzgk/M64rLYVeGptob rwfQ== X-Received: by 10.66.163.5 with SMTP id ye5mr4986244pab.60.1369857103400; Wed, 29 May 2013 12:51:43 -0700 (PDT) Received: from [10.35.247.147] (mobile-166-147-083-100.mycingular.net. [166.147.83.100]) by mx.google.com with ESMTPSA id qh4sm41122327pac.8.2013.05.29.12.51.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 May 2013 12:51:42 -0700 (PDT) References: <201305291941.r4TJfaWN022025@svn.freebsd.org> Mime-Version: 1.0 (1.0) In-Reply-To: <201305291941.r4TJfaWN022025@svn.freebsd.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: <27261F76-9F6D-4A1A-AB35-50E2F8DC9311@gmail.com> X-Mailer: iPhone Mail (10B329) From: Garrett Cooper Subject: Re: svn commit: r251108 - in head/contrib/atf/atf-c++: . detail Date: Wed, 29 May 2013 12:51:35 -0700 To: Marcel Moolenaar Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 May 2013 19:51:43 -0000 Thanks for this! Please don't commit the change I attached earlier to share/= atf/Makefile though--it makes an integration test pass but it causes runtime= to go to a crawl when running atf-run; that's why my demo at BSDCan didn't w= ork ;(.. Sent from my iPhone On May 29, 2013, at 12:41 PM, Marcel Moolenaar wrote: > Author: marcel > Date: Wed May 29 19:41:36 2013 > New Revision: 251108 > URL: http://svnweb.freebsd.org/changeset/base/251108 >=20 > Log: > Modify atf::fs::path::get_process_helpers_path API to properly > handle pathing with detail/ tests. Based on patch pushed upstream to > ATF project. >=20 > Obtained from: Garrett Cooper >=20 > Modified: > head/contrib/atf/atf-c++/check_test.cpp > head/contrib/atf/atf-c++/detail/process_test.cpp > head/contrib/atf/atf-c++/detail/test_helpers.cpp > head/contrib/atf/atf-c++/detail/test_helpers.hpp >=20 > Modified: head/contrib/atf/atf-c++/check_test.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/contrib/atf/atf-c++/check_test.cpp Wed May 29 19:16:59 2013 = (r251107) > +++ head/contrib/atf/atf-c++/check_test.cpp Wed May 29 19:41:36 2013 = (r251108) > @@ -61,7 +61,7 @@ std::auto_ptr< atf::check::check_result=20 > do_exec(const atf::tests::tc* tc, const char* helper_name) > { > std::vector< std::string > argv; > - argv.push_back(get_process_helpers_path(*tc).str()); > + argv.push_back(get_process_helpers_path(*tc, false).str()); > argv.push_back(helper_name); > std::cout << "Executing " << argv[0] << " " << argv[1] << "\n"; >=20 > @@ -74,7 +74,7 @@ std::auto_ptr< atf::check::check_result=20 > do_exec(const atf::tests::tc* tc, const char* helper_name, const char *car= g2) > { > std::vector< std::string > argv; > - argv.push_back(get_process_helpers_path(*tc).str()); > + argv.push_back(get_process_helpers_path(*tc, false).str()); > argv.push_back(helper_name); > argv.push_back(carg2); > std::cout << "Executing " << argv[0] << " " << argv[1] << " " >=20 > Modified: head/contrib/atf/atf-c++/detail/process_test.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/contrib/atf/atf-c++/detail/process_test.cpp Wed May 29 19:16:5= 9 2013 (r251107) > +++ head/contrib/atf/atf-c++/detail/process_test.cpp Wed May 29 19:41:3= 6 2013 (r251108) > @@ -64,10 +64,10 @@ exec_process_helpers(const atf::tests::t > using atf::process::exec; >=20 > std::vector< std::string > argv; > - argv.push_back(get_process_helpers_path(tc).leaf_name()); > + argv.push_back(get_process_helpers_path(tc, true).leaf_name()); > argv.push_back(helper_name); >=20 > - return exec(get_process_helpers_path(tc), > + return exec(get_process_helpers_path(tc, true), > atf::process::argv_array(argv), > atf::process::stream_inherit(), > atf::process::stream_inherit()); >=20 > Modified: head/contrib/atf/atf-c++/detail/test_helpers.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/contrib/atf/atf-c++/detail/test_helpers.cpp Wed May 29 19:16:5= 9 2013 (r251107) > +++ head/contrib/atf/atf-c++/detail/test_helpers.cpp Wed May 29 19:41:3= 6 2013 (r251108) > @@ -82,10 +82,14 @@ header_check(const char *hdrname) > } >=20 > atf::fs::path > -get_process_helpers_path(const atf::tests::tc& tc) > +get_process_helpers_path(const atf::tests::tc& tc, bool is_detail) > { > - return atf::fs::path(tc.get_config_var("srcdir")) / > - ".." / "atf-c" / "detail" / "process_helpers"; > + if (is_detail) > + return atf::fs::path(tc.get_config_var("srcdir")) / > + ".." / ".." / "atf-c" / "detail" / "process_helpers"; > + else > + return atf::fs::path(tc.get_config_var("srcdir")) / > + ".." / "atf-c" / "detail" / "process_helpers"; > } >=20 > bool >=20 > Modified: head/contrib/atf/atf-c++/detail/test_helpers.hpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/contrib/atf/atf-c++/detail/test_helpers.hpp Wed May 29 19:16:5= 9 2013 (r251107) > +++ head/contrib/atf/atf-c++/detail/test_helpers.hpp Wed May 29 19:41:3= 6 2013 (r251108) > @@ -86,7 +86,7 @@ class tc; >=20 > void header_check(const char*); > void build_check_cxx_o(const atf::tests::tc&, const char*, const char*, bo= ol); > -atf::fs::path get_process_helpers_path(const atf::tests::tc&); > +atf::fs::path get_process_helpers_path(const atf::tests::tc&, bool); > bool grep_file(const char*, const char*); > bool grep_string(const std::string&, const char*); >=20 > _______________________________________________ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"