Re: using xlocale to implement std::locale class

[François Dumont <francois dot cppdevs at free dot fr>]

On 05/06/2011 09:25 PM, Sam Varshavchik wrote:
> Paolo Carlini writes:
>
> > On 05/05/2011 10:52 PM, Paolo Carlini wrote:
> > > Indeed, it would be nice if Sam could test the patch. I can also 
> > > look into it tomorrow or over the next days anyway.
> > >
> > > Francois, what did you mean exactly in the audit trail by: "For info 
> > > a regression has been reported using this patch so it is surely not 
> > > yet ready."? On which test? In which conditions?
> > In the meanwhile I re-diffed the patch vs current mainline and 
> > attached it to the PR.
> >
> > On GNU-Linux I'm seeing this fail:
> >
> > named_equivalence.exe: 
> > .../libstdc++-v3/testsuite/22_locale/messages_byname/named_equivalence.cc:67: 
> > void test01(): Assertion `s03 == "bitte"' failed.
> > FAIL: 22_locale/messages_byname/named_equivalence.cc execution test
> >
> > no idea at moment whether it's something serious or a small tweak on 
> > top of it would be enough. Maybe Sam can help...
>
> I don't think I'm running the testsuite correctly. I've executing make 
> check RUNTESTFLAGS='conformance.exp=messages*'. I do not get this 
> failure even though I have Francois' patch applied, and my out of tree 
> test for the original bug, that I'm linking directly against the built 
> libstdc++.a passes the test for the fix. Yet, make check seems to work 
> without applying the fix to messages_byname/named_equivalence.cc. But 
> if I stick VERIFY(0 == 1) in there, it fails.
>
> In any case, I think the existing regression tests should be trivially 
> modifiable to test Francois' patch too. All you need is to another 
> call to open() for another domain ("gcc" should be good enough), after 
> one of the existing calls. Without the messages patch, this should 
> make the regression test break. With the patch, it will still work.
Thanks Sam for the tips to work on my message facet issue, I will try 
with strace.

Here is attached the test I had written to challenge my patch using 
okular and pulseaudio catalogs. It should go into 
testsuite/22_locale/messages/members/char.

Regards

// { dg-require-namedlocale "fr_FR" }

// 2001-07-17 Benjamin Kosnik  <bkoz@redhat.com>

// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library.  This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.

// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3.  If not see
// <http://www.gnu.org/licenses/>.

// 22.2.7.1.1 messages members

#include <locale>
#include <testsuite_hooks.h>

void test01()
{
  using namespace std;
  typedef std::messages<char>::catalog catalog;
  typedef std::messages<char>::string_type string_type;

  bool test __attribute__((unused)) = true;

  // basic construction
  locale loc_c = locale::classic();
  locale loc_fr = locale("fr_FR");
  VERIFY( loc_c != loc_fr );

  // cache the messages facets
  const messages<char>& mssg_fr = use_facet<messages<char> >(loc_fr); 

  // catalog open(const string&, const locale&) const;
  // string_type get(catalog, int, int, const string_type& ) const; 
  // void close(catalog) const;

  // Check locale.
  catalog cat_okular = mssg_fr.open("okular", loc_c);
  VERIFY( cat_okular >= 0 );
  catalog cat_pulseaudio = mssg_fr.open("pulseaudio", loc_c);
  VERIFY( cat_pulseaudio >= 0 );
  VERIFY( cat_okular != cat_pulseaudio );

  string s01 = mssg_fr.get(cat_okular, 0, 0, "seconds");
  string s02 = mssg_fr.get(cat_pulseaudio, 0, 0, "PulseAudio Sound Server");

  VERIFY( s01 == "secondes" ||
	  s02 == "Serveur de Son PulseAudio" );
  VERIFY( s02 == "Serveur de Son PulseAudio" );
  VERIFY( s01 == "secondes" );
  mssg_fr.close(cat_pulseaudio);
  mssg_fr.close(cat_okular);
}

int main()
{
  test01();
  return 0;
}