Skip to content

Commit

Permalink
Add conan test package
Browse files Browse the repository at this point in the history
  • Loading branch information
agauniyal committed Jan 27, 2018
1 parent ed9537a commit 7d4c016
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 29 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ build_script:
- cmd: mainTest.exe
- cmd: colorTest.exe
- cmd: envTermMissing.exe
- cmd: OpenCppCoverage --sources C:\projects\rang --export_type=binary:visualTestReport.bin -- visualTest.exe
- cmd: OpenCppCoverage --sources C:\projects\rang --export_type=binary:envTermMissingReport.bin -- envTermMissing.exe
- cmd: OpenCppCoverage --sources C:\projects\rang --export_type=binary:mainTestReport.bin -- mainTest.exe
- cmd: OpenCppCoverage --sources C:\projects\rang --export_type=binary:colorTestReport.bin -- colorTest.exe
- cmd: OpenCppCoverage --sources C:\projects\rang --export_type=cobertura:overallReport.xml --input_coverage=mainTestReport.bin --input_coverage=visualTestReport.bin --input_coverage=colorTestReport.bin
- cmd: OpenCppCoverage --sources C:\projects\rang --export_type=cobertura:overallReport.xml --input_coverage=mainTestReport.bin --input_coverage=envTermMissingReport.bin --input_coverage=colorTestReport.bin
- cmd: codecov --root ../.. --no-color --disable gcov -f overallReport.xml
3 changes: 2 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ class RangConan(ConanFile):
description = "A Minimal, Header only Modern c++ library for colors in your terminal"
generators = "pkg_config"
build_requires = "doctest/1.2.6@bincrafters/stable"
exports_sources = "*"

def build(self):
meson = Meson(self)
meson.configure()
meson.configure(cache_build_folder="build")
meson.build()

def package(self):
Expand Down
3 changes: 0 additions & 3 deletions test/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@ test('mainTest', mainTest)
colorTest = executable('colorTest', 'colorTest.cpp', include_directories : inc)
test('colorTest', colorTest)

visualTest = executable('visualTest', 'visualTest.cpp', include_directories : inc)
test('visualTest', visualTest)

envTermMissing = executable('envTermMissing', 'envTermMissing.cpp', include_directories : inc)
test('envTermMissing', envTermMissing)
23 changes: 0 additions & 23 deletions test/visualTest.cpp

This file was deleted.

17 changes: 17 additions & 0 deletions test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from conans import ConanFile, Meson
import os

class RangConan(ConanFile):
generators = "pkg_config"
exports_sources = "*"

def build(self):
meson = Meson(self)
meson.configure()
meson.build()

def imports(self):
self.copy("*.hpp")

def test(self):
self.run(".%svisualTest" % os.sep)
7 changes: 7 additions & 0 deletions test_package/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
project('rang', 'cpp', version : '3.0',
default_options : ['cpp_std=c++11'])

inc = include_directories('include')

visualTest = executable('visualTest', 'visualTest.cpp', include_directories : inc)
test('visualTest', visualTest)
13 changes: 13 additions & 0 deletions test_package/visualTest.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include "rang.hpp"
#include <string>

using namespace std;
using namespace rang;

int main()
{
cout << endl
<< style::reset << bg::green << fg::gray << style::bold
<< " Rang works! " << bg::reset << fg::reset << style::reset << '\n'
<< endl;
}

0 comments on commit 7d4c016

Please sign in to comment.