Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
c87ecb0e
Kaydet (Commit)
c87ecb0e
authored
Kas 19, 2016
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove dep on unotest from osl_Pipe test
Change-Id: I5f5862a684e52bd3d1336fa9f8cffa77cdebbe4c
üst
d015317f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
43 deletions
+5
-43
uniquepipename.hxx
include/osl/test/uniquepipename.hxx
+2
-1
uniquepipename.hxx
include/unotest/uniquepipename.hxx
+0
-37
CppunitTest_sal_osl_pipe.mk
sal/CppunitTest_sal_osl_pipe.mk
+0
-1
osl_Pipe.cxx
sal/qa/osl/pipe/osl_Pipe.cxx
+1
-1
Library_unotest.mk
unotest/Library_unotest.mk
+0
-1
officeconnection.cxx
unotest/source/cpp/officeconnection.cxx
+2
-2
No files found.
unotest/source/cpp/uniquepipename.c
xx
→
include/osl/test/uniquepipename.h
xx
Dosyayı görüntüle @
c87ecb0e
...
...
@@ -22,8 +22,8 @@
#include "osl/process.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "unotest/uniquepipename.hxx"
namespace
osl
{
namespace
test
{
OUString
uniquePipeName
(
OUString
const
&
name
)
{
...
...
@@ -35,6 +35,7 @@ OUString uniquePipeName(OUString const & name) {
return
name
+
OUString
::
number
(
info
.
Ident
);
}
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/unotest/uniquepipename.hxx
deleted
100644 → 0
Dosyayı görüntüle @
d015317f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
#define INCLUDED_UNOTEST_UNIQUEPIPENAME_HXX
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <unotest/detail/unotestdllapi.hxx>
namespace
test
{
// Create a system-wide unique name (for use with osl::Pipe):
OOO_DLLPUBLIC_UNOTEST
OUString
uniquePipeName
(
OUString
const
&
name
);
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sal/CppunitTest_sal_osl_pipe.mk
Dosyayı görüntüle @
c87ecb0e
...
...
@@ -15,7 +15,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_pipe, \
$(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \
sal \
unotest \
$(gb_UWINAPI) \
))
...
...
sal/qa/osl/pipe/osl_Pipe.cxx
Dosyayı görüntüle @
c87ecb0e
...
...
@@ -24,9 +24,9 @@
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "unotest/uniquepipename.hxx"
#include <rtl/ustring.hxx>
#include <osl/test/uniquepipename.hxx>
#include <osl/thread.hxx>
#include <osl/mutex.hxx>
...
...
unotest/Library_unotest.mk
Dosyayı görüntüle @
c87ecb0e
...
...
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_exception_objects,unotest,\
unotest/source/cpp/macros_test \
unotest/source/cpp/officeconnection \
unotest/source/cpp/toabsolutefileurl \
unotest/source/cpp/uniquepipename \
))
# vim: set noet sw=4 ts=4:
unotest/source/cpp/officeconnection.cxx
Dosyayı görüntüle @
c87ecb0e
...
...
@@ -27,12 +27,12 @@
#include "cppuhelper/bootstrap.hxx"
#include "cppunit/TestAssert.h"
#include "osl/process.h"
#include "osl/test/uniquepipename.hxx"
#include "osl/time.h"
#include "sal/macros.h"
#include "sal/types.h"
#include "unotest/officeconnection.hxx"
#include "unotest/toabsolutefileurl.hxx"
#include "unotest/uniquepipename.hxx"
#include "getargument.hxx"
...
...
@@ -53,7 +53,7 @@ void OfficeConnection::setUp() {
"soffice"
,
&
argSoffice
));
if
(
argSoffice
.
match
(
"path:"
))
{
desc
=
"pipe,name="
+
uniquePipeName
(
"oootest"
);
desc
=
"pipe,name="
+
osl
::
test
::
uniquePipeName
(
"oootest"
);
OUString
noquickArg
(
"--quickstart=no"
);
OUString
norestoreArg
(
"--norestore"
);
OUString
nologoArg
(
"--nologo"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment