Commit 165c20b6 by Hugo Beauzée-Luyssen

Start transitionning to autotools

parent ae293d49
......@@ -3,3 +3,14 @@
#*#
.*.swp
compile
config.status
config.h*
config.log
configure
Makefile
Makefile.in
aclocal.m4
*.cache
build*
[submodule "test/samples/samples"]
path = test/samples/samples
url = git@code.videolan.org:videolan/medialibrary-test-samples.git
[submodule "googletest"]
path = googletest
url = https://github.com/google/googletest.git
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -Wall -Wsign-compare -Wextra -Wstrict-aliasing -Wstrict-overflow \
-Wformat=2 -Wno-unused-parameter -Wcast-align -Wpointer-arith \
-Wwrite-strings -Wlogical-op \
-pipe
MEDIALIB_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/src
libmedialibrary_la_SOURCES = \
src/Album.cpp \
src/AlbumTrack.cpp \
src/Artist.cpp \
src/AudioTrack.cpp \
src/Device.cpp \
src/Factory.cpp \
src/File.cpp \
src/Folder.cpp \
src/Genre.cpp \
src/History.cpp \
src/Label.cpp \
src/Media.cpp \
src/MediaLibrary.cpp \
src/Movie.cpp \
src/Playlist.cpp \
src/Settings.cpp \
src/Show.cpp \
src/ShowEpisode.cpp \
src/VideoTrack.cpp \
src/database/SqliteConnection.cpp \
src/database/SqliteTools.cpp \
src/database/SqliteTransaction.cpp \
src/discoverer/DiscovererWorker.cpp \
src/discoverer/FsDiscoverer.cpp \
src/factory/FileSystem.cpp \
src/filesystem/common/CommonFile.cpp \
src/logging/IostreamLogger.cpp \
src/logging/Logger.cpp \
src/metadata_services/MetadataParser.cpp \
src/metadata_services/vlc/VLCMetadataService.cpp \
src/metadata_services/vlc/VLCThumbnailer.cpp \
src/parser/Parser.cpp \
src/parser/ParserService.cpp \
src/utils/Filename.cpp \
src/utils/ModificationsNotifier.cpp \
src/utils/VLCInstance.cpp \
$(NULL)
if HAVE_WIN32
libmedialibrary_la_SOURCES += \
src/filesystem/win32/Directory.cpp \
src/filesystem/win32/File.cpp
else
libmedialibrary_la_SOURCES += \
src/filesystem/unix/Device.cpp \
src/filesystem/unix/Directory.cpp \
src/filesystem/unix/File.cpp
endif
libmedialibrary_la_LDFLAGS = -no-undefined
libmedialibrary_la_CPPFLAGS = \
$(MEDIALIB_CPPFLAGS) \
$(SQLITE_CFLAGS) \
$(VLC_CFLAGS) \
$(VLCPP_CFLAGS) \
$(NULL)
libmedialibrary_la_LIBADD = \
$(SQLITE_LIBS) \
$(VLC_LIBS) \
$(LIBJPEG_LIBS) \
$(NULL)
lib_LTLIBRARIES = libmedialibrary.la
if HAVE_TESTS
check_PROGRAMS = unittest samples
lib_LTLIBRARIES += libgtest.la libgtestmain.la
libgtest_la_SOURCES = \
googletest/src/gtest-all.cc
libgtestmain_la_SOURCES = \
googletest/src/gtest_main.cc
libgtest_la_CPPFLAGS = \
-I$(top_srcdir)/googletest
if HAVE_PTHREAD
libgtest_la_CPPFLAGS += -DGTEST_HAS_PTHREAD=1
libgtest_la_CXXFLAGS = $(PTHREAD_CFLAGS)
libgtest_la_LIDADD = $(PTHREAD_LIBS)
else
libgtest_la_CPPFLAGS += -DGTEST_HAS_PTHREAD=0
endif
libgtestmain_la_CPPFLAGS = $(libgtest_la_CPPFLAGS)
libgtestmain_la_CXXFLAGS = $(libgtest_la_CXXFLAGS)
libgtestmain_la_LIBADD = $(libgtest_la_LIBADD)
unittest_SOURCES = \
test/common/MediaLibraryTester.cpp \
test/mocks/FileSystem.cpp \
test/mocks/filesystem/MockDevice.cpp \
test/mocks/filesystem/MockDirectory.cpp \
test/mocks/filesystem/MockFile.cpp \
test/unittest/AlbumTests.cpp \
test/unittest/AlbumTrackTests.cpp \
test/unittest/ArtistTests.cpp \
test/unittest/AudioTrackTests.cpp \
test/unittest/DeviceTests.cpp \
test/unittest/FileTests.cpp \
test/unittest/FolderTests.cpp \
test/unittest/FsUtilsTests.cpp \
test/unittest/GenreTests.cpp \
test/unittest/HistoryTests.cpp \
test/unittest/LabelTests.cpp \
test/unittest/MediaTests.cpp \
test/unittest/MovieTests.cpp \
test/unittest/PlaylistTests.cpp \
test/unittest/RemovalNotifierTests.cpp \
test/unittest/ShowTests.cpp \
test/unittest/Tests.cpp \
test/unittest/VideoTrackTests.cpp \
$(NULL)
unittest_CXXFLAGS = \
$(MEDIALIB_CPPFLAGS) \
-I$(top_srcdir)/test \
$(NULL)
unittest_LDADD = \
libmedialibrary.la \
libgtest.la \
libgtestmain.la \
$(PTHREAD_LIBS) \
$(SQLITE_LIBS) \
$(NULL)
samples_SOURCES = \
test/common/MediaLibraryTester.cpp \
test/samples/main.cpp \
test/samples/Tester.cpp \
$(NULL)
samples_CXXFLAGS = \
$(MEDIALIB_CPPFLAGS) \
-DSRC_DIR=\"$(top_srcdir)\" \
-I$(top_srcdir)/test \
$(NULL)
samples_LDADD = \
libmedialibrary.la \
libgtest.la \
libgtestmain.la \
$(PTHREAD_LIBS) \
$(SQLITE_LIBS) \
$(NULL)
endif
#! /bin/sh
set -x
cd "$(dirname "$0")"
autoreconf -fis
m4_define([MEDIALIB_MAJOR], [0])
m4_define([MEDIALIB_MINOR], [2])
m4_define([MEDIALIB_MICRO], [0])
AC_COPYRIGHT([Copyright 2014-2016 Hugo Beauzée-Luyssen - VideoLabs])
AC_INIT([medialibrary], [MEDIALIB_MAJOR.MEDIALIB_MINOR.MEDIALIB_MICRO])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign subdir-objects])
m4_ifdef([AM_SILENT_RULES], [
AM_SILENT_RULES([yes])
])
AC_CANONICAL_HOST
MEDIALIBRARY_MAJOR=MEDIALIB_MAJOR
MEDIALIBRARY_MINOR=MEDIALIB_MINOR
MEDIALIBRARY_MICRO=MEDIALIB_MICRO
AC_SUBST(MEDIALIBRARY_MAJOR)
AC_SUBST(MEDIALIBRARY_MINOR)
AC_SUBST(MEDIALIBRARY_MICRO)
LT_INIT([win32-dll, shared])
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11([noext])
AC_CONFIG_MACRO_DIR([m4])
AC_HEADER_ASSERT
dnl
dnl Check the operating system
dnl
HAVE_WIN64="0"
HAVE_IOS="0"
HAVE_OSX="0"
HAVE_TVOS="0"
case "${host_os}" in
"")
SYS=unknown
;;
linux*)
SYS=linux
;;
bsdi*)
SYS=bsdi
;;
freebsd*)
SYS=freebsd
CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
LDFLAGS="${LDFLAGS} -L/usr/local/lib"
;;
openbsd*)
SYS=openbsd
CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/X11R6/include"
LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib/"
;;
netbsd*)
SYS=netbsd
;;
dragonfly*)
SYS=dragonfly
;;
darwin*)
dnl Force gcc "-arch" flag
ARCH_flag=""
case "${host}" in
i?86*)
ARCH_flag="-arch i386"
;;
ppc64*)
ARCH_flag="-arch ppc64"
;;
ppc*)
ARCH_flag="-arch ppc"
;;
x86_64*)
ARCH_flag="-arch x86_64"
;;
arm*)
ac_cv_c_bigendian="no"
ac_cv_c_attribute_packed="no"
;;
esac
SYS=darwin
CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}"
CXX="${CXX} -stdlib=libc++ -std=c++11"
CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu11 ${ARCH_flag}"
LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
AC_EGREP_CPP(yes,
[#import <TargetConditionals.h>
#if TARGET_OS_IPHONE
yes
#endif],
[HAVE_IOS="1"],
[HAVE_OSX="1"])
AC_EGREP_CPP(yes,
[#import <TargetConditionals.h>
#if TARGET_OS_TV
yes
#endif],
[HAVE_TVOS="1"
HAVE_IOS="0"
HAVE_OSX="0"
],)
dnl Allow binaries created on Lion to run on earlier releases
AC_EGREP_CPP(yes,
[#import <Cocoa/Cocoa.h>
#ifdef MAC_OS_X_VERSION_10_7
yes
#endif],
[AC_MSG_RESULT([yes])
AC_LIBOBJ([getdelim])
AC_LIBOBJ([strndup])
AC_LIBOBJ([strnlen])],)
dnl
dnl Handle Mac OS X SDK flags
dnl
AC_ARG_WITH(macosx-sdk,
[AS_HELP_STRING([--with-macosx-sdk=DIR],
[compile using the SDK in DIR])])
if test "${with_macosx_sdk}" != "" ; then
test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
CPP="${CPP} -isysroot ${with_macosx_sdk}"
CC="${CC} -isysroot ${with_macosx_sdk}"
CXX="${CXX} -isysroot ${with_macosx_sdk}"
OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
LD="${LD} -syslibroot ${with_macosx_sdk}"
fi
AC_ARG_WITH(macosx-version-min,
[AS_HELP_STRING([--with-macosx-version-min=VERSION],
[compile for Mac OS X VERSION and above])])
if test "${with_macosx_version_min}" != "" ; then
CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"
fi
;;
*mingw32* | *cygwin* | *wince* | *mingwce*)
AC_DEFINE([_UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.])
AC_DEFINE([UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.])
AC_DEFINE([_POSIX_C_SOURCE], [200809L], [IEEE Std 1003.1.])
AC_DEFINE([_BSD_SOURCE], [1], [ISO C, POSIX, and 4.3BSD things.])
case "${host_os}" in
*mingw32*)
SYS=mingw32
;;
*cygwin*)
SYS=cygwin
;;
esac
if test "${SYS}" = "mingw32"; then
# DEP, ASLR, NO SEH
LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase"
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/"
dnl
dnl NSIS/MSI Installer prefix and WIN64
dnl
case "${host}" in
amd64*|x86_64*)
HAVE_WIN64="1"
WINDOWS_ARCH="x64"
PROGRAMFILES="PROGRAMFILES64"
;;
*)
WINDOWS_ARCH="x86"
PROGRAMFILES="PROGRAMFILES"
;;
esac
AC_SUBST(WINDOWS_ARCH)
AC_SUBST(PROGRAMFILES)
fi
;;
*nto*)
SYS=nto
;;
solaris*)
SYS=solaris
;;
hpux*)
SYS=hpux
;;
*os2*)
SYS=os2
LDFLAGS="${LDFLAGS} -Zomf -Zbin-files -Zargs-wild -Zhigh-mem"
AC_LIBOBJ([freeaddrinfo])
;;
*)
SYS="${host_os}"
;;
esac
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
PKG_CHECK_MODULES(SQLITE, sqlite3)
PKG_CHECK_MODULES(VLC, libvlc >= 3.0)
PKG_CHECK_MODULES(VLCPP, libvlcpp)
PKG_CHECK_MODULES(LIBJPEG, libjpeg, [
have_libjpeg="yes"
AC_DEFINE(HAVE_JPEG, 1, [Define to 1 if libjpeg is available])
])
AM_CONDITIONAL([HAVE_LIBJPEG], [test "${have_libjpeg}" = "yes"])
AC_ARG_ENABLE(tests,[build automated tests suites],enable_tests="yes")
AM_CONDITIONAL([HAVE_TESTS], [test "${enable_tests}" = "yes"])
AS_IF([test "${enable_tests}" = "yes"], [
AX_PTHREAD([have_pthread=yes],[have_pthread=no])
])
AM_CONDITIONAL([HAVE_PTHREAD], [test "${have_pthread}" = "yes"])
PKG_INSTALLDIR
AC_CONFIG_FILES([
Makefile
])
AC_OUTPUT
Subproject commit c99458533a9b4c743ed51537e25989ea55944908
libtool.m4
ltoptions.m4
ltsugar.m4
ltversion.m4
lt~obsolete.m4
# ============================================================================
# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
# ============================================================================
#
# SYNOPSIS
#
# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
#
# DESCRIPTION
#
# Check for baseline language coverage in the compiler for the C++11
# standard; if necessary, add switches to CXXFLAGS to enable support.
#
# The first argument, if specified, indicates whether you insist on an
# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
# -std=c++11). If neither is specified, you get whatever works, with
# preference for an extended mode.
#
# The second argument, if specified 'mandatory' or if left unspecified,
# indicates that baseline C++11 support is required and that the macro
# should error out if no mode with that support is found. If specified
# 'optional', then configuration proceeds regardless, after defining
# HAVE_CXX11 if and only if a supporting mode is found.
#
# LICENSE
#
# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
# Copyright (c) 2014 Alexey Sokolov <sokolov@google.com>
# Copyright (c) 2014, 2015 Google Inc.
# Copyright (c) 2015 VLC authors and VideoLAN
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 7
m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[
template <typename T>
struct check
{
static_assert(sizeof(int) <= sizeof(T), "not big enough");
};
struct Base {
virtual void f() {}
};
struct Child : public Base {
virtual void f() override {}
};
typedef check<check<bool>> right_angle_brackets;
int a;
decltype(a) b;
typedef check<int> check_type;
check_type c;
check_type&& cr = static_cast<check_type&&>(c);
auto d = a;
auto l = [](){};
// http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
// Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this
namespace test_template_alias_sfinae {
struct foo {};
template<typename T>
using member = typename T::member_type;
template<typename T>
void func(...) {}
template<typename T>
void func(member<T>*) {}
void test() {
func<foo>(0);
}
}
#include <cinttypes>
constexpr uint64_t constantname = UINT64_C(0x100000000);
]])
AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
m4_if([$1], [], [],
[$1], [ext], [],
[$1], [noext], [],
[m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
[$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
[$2], [optional], [ax_cxx_compile_cxx11_required=false],
[m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])
AC_LANG_PUSH([C++])dnl
ac_success=no
AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
ax_cv_cxx_compile_cxx11,
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
[ax_cv_cxx_compile_cxx11=yes],
[ax_cv_cxx_compile_cxx11=no])])
if test x$ax_cv_cxx_compile_cxx11 = xyes; then
ac_success=yes
fi
m4_if([$1], [noext], [], [dnl
if test x$ac_success = xno; then
for switch in -std=gnu++11 -std=gnu++0x; do
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
$cachevar,
[ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
[eval $cachevar=yes],
[eval $cachevar=no])
CXXFLAGS="$ac_save_CXXFLAGS"])
if eval test x\$$cachevar = xyes; then
CXXFLAGS="$CXXFLAGS $switch"
ac_success=yes
break
fi
done
fi])
m4_if([$1], [ext], [], [dnl
if test x$ac_success = xno; then
for switch in -std=c++11 -std=c++0x; do
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
$cachevar,
[ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
[eval $cachevar=yes],
[eval $cachevar=no])
CXXFLAGS="$ac_save_CXXFLAGS"])
if eval test x\$$cachevar = xyes; then
CXXFLAGS="$CXXFLAGS $switch"
ac_success=yes
break
fi
done
fi])
AC_LANG_POP([C++])
if test x$ax_cxx_compile_cxx11_required = xtrue; then
if test x$ac_success = xno; then
AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
fi
else
if test x$ac_success = xno; then
HAVE_CXX11=0
AC_MSG_NOTICE([No compiler with C++11 support was found])
else
HAVE_CXX11=1
AC_DEFINE(HAVE_CXX11,1,
[define if the compiler supports basic C++11 syntax])
fi
AC_SUBST(HAVE_CXX11)
fi
])
......@@ -23,7 +23,7 @@
#include "VLCThumbnailer.h"
#include <cstring>
#ifdef WITH_JPEG
#ifdef HAVE_JPEG
#include <jpeglib.h>
#if ( ( !defined(JPEG_LIB_VERSION_MAJOR) && !defined(JPEG_LIB_VERSION_MINOR) ) || \
( JPEG_LIB_VERSION_MAJOR <= 8 && JPEG_LIB_VERSION_MINOR < 4 ) ) && \
......@@ -33,7 +33,7 @@
#else
#define JPEG_COLORSPACE JCS_RGB
#endif
#elif defined(WITH_EVAS)
#elif defined(HAVE_EVAS)
#include <Evas_Engine_Buffer.h>
#endif
#include <setjmp.h>
......@@ -47,7 +47,7 @@
VLCThumbnailer::VLCThumbnailer()
: m_instance( VLCInstance::get() )
#ifdef WITH_EVAS
#ifdef HAVE_EVAS
, m_canvas( nullptr, &evas_free )
#endif
, m_thumbnailRequired( false )
......@@ -55,7 +55,7 @@ VLCThumbnailer::VLCThumbnailer()
, m_height( 0 )
, m_prevSize( 0 )
{
#ifdef WITH_EVAS
#ifdef HAVE_EVAS
static int fakeBuffer;
#ifndef TIZEN
evas_init();
......@@ -82,7 +82,7 @@ VLCThumbnailer::VLCThumbnailer()
VLCThumbnailer::~VLCThumbnailer()
{
#if defined(WITH_EVAS) && !defined(TIZEN)
#if defined(HAVE_EVAS) && !defined(TIZEN)
evas_shutdown();
#endif
}
......@@ -257,7 +257,7 @@ parser::Task::Status VLCThumbnailer::takeThumbnail( std::shared_ptr<Media> media
return compress( media, file );
}
#ifdef WITH_JPEG
#ifdef HAVE_JPEG
struct jpegError : public jpeg_error_mgr
{
......@@ -279,7 +279,7 @@ parser::Task::Status VLCThumbnailer::compress( std::shared_ptr<Media> media, std
auto path = m_ml->thumbnailPath();
path += "/";
path += toString( media->id() ) +
#ifdef WITH_EVAS
#ifdef HAVE_EVAS
".png";
#else
".jpg";
......@@ -289,7 +289,7 @@ parser::Task::Status VLCThumbnailer::compress( std::shared_ptr<Media> media, std
auto vOffset = m_height > DesiredHeight ? ( m_height - DesiredHeight ) / 2 : 0;
const auto stride = m_width * Bpp;
#ifdef WITH_JPEG
#ifdef HAVE_JPEG
//FIXME: Abstract this away, though libjpeg requires a FILE*...
auto fOut = std::unique_ptr<FILE, int(*)(FILE*)>( fopen( path.c_str(), "wb" ), &fclose );
if ( fOut == nullptr )
......@@ -333,7 +333,7 @@ parser::Task::Status VLCThumbnailer::compress( std::shared_ptr<Media> media, std
}
jpeg_finish_compress(&compInfo);
jpeg_destroy_compress(&compInfo);
#elif defined(WITH_EVAS)
#elif defined(HAVE_EVAS)
auto evas_obj = std::unique_ptr<Evas_Object, void(*)(Evas_Object*)>( evas_object_image_add( m_canvas.get() ), evas_object_del );
if ( evas_obj == nullptr )
return parser::Task::Status::Error;
......
......@@ -22,20 +22,24 @@
#pragma once
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <condition_variable>
#include <vlcpp/vlc.hpp>
#if defined(WITH_EVAS)
#if defined(HAVE_EVAS)
#include <Evas.h>
#endif
#include "parser/ParserService.h"
#ifdef WITH_JPEG
#ifdef HAVE_JPEG
#define BPP 3
#define VLC_FOURCC "RV24"
#elif defined(WITH_EVAS)
#elif defined(HAVE_EVAS)
#define BPP 4
#define VLC_FOURCC "RV32"
#else
......@@ -71,7 +75,7 @@ private:
std::mutex m_mutex;
std::condition_variable m_cond;
// Per thumbnail variables
#ifdef WITH_EVAS
#ifdef HAVE_EVAS
std::unique_ptr<Evas, void(*)(Evas*)> m_canvas;
std::unique_ptr<uint8_t[]> m_cropBuffer;
#endif
......
#include "Tester.h"
#include <algorithm>
extern bool Verbose;
extern bool ExtraVerbose;
......
......@@ -45,7 +45,7 @@ TEST_P( Tests, Parse )
for ( auto i = 0u; i < input.Size(); ++i )
{
// Quick and dirty check to ensure we're discovering something that exists
auto samplesDir = TestDirectory + "/samples/" + input[i].GetString();
auto samplesDir = TestDirectory + "samples/" + input[i].GetString();
struct stat s;
auto res = stat( samplesDir.c_str(), &s );
ASSERT_EQ( 0, res );
......@@ -99,9 +99,6 @@ int main(int ac, char** av)
}
INSTANTIATE_TEST_CASE_P(SamplesTests, Tests,
::testing::ValuesIn(testCases),
// gtest default parameter name displayer (testing::PrintToStringParamName)
// seems to add " " around the parameter name, making it invalid.
[](::testing::TestParamInfo<const char*> i){ return i.param; } );
::testing::ValuesIn(testCases) );
::testing::Environment* const env = ::testing::AddGlobalTestEnvironment(new TestEnv);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment