Skip to content

Commit d220612

Browse files
pjohnmeyerpjohnmeyer
committed
Merge pull request #111 from unittest-cpp/v1.6.1-prep
v1.6.1 prep
2 parents 90357e2 + 782e620 commit d220612

4 files changed

Lines changed: 13 additions & 8 deletions

File tree

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ Via svn:
3030

3131
svn checkout https://github.com/unittest-cpp/unittest-cpp/trunk unittest-cpp
3232

33-
### Latest release (v1.6.0) ###
33+
### Latest release (v1.6.1) ###
3434

3535
Via git:
3636

3737
git clone https://github.com/unittest-cpp/unittest-cpp
3838
cd unittest-cpp
39-
git checkout v1.6.0
39+
git checkout v1.6.1
4040

4141
Via svn:
4242

43-
svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v1.6.0 unittest-cpp
43+
svn checkout https://github.com/unittest-cpp/unittest-cpp/tags/v1.6.1 unittest-cpp
4444

4545
License
4646
---------
@@ -58,7 +58,7 @@ Contributors
5858
* Charles Nicholson (charles.nicholson@gmail.com) @charlesnicholson
5959

6060
### Original Authors: ###
61-
* Noel Llopis (llopis@convexhull.com)
61+
* Noel Llopis (llopis@convexhull.com)
6262
* Charles Nicholson (charles.nicholson@gmail.com)
6363

6464
### Contributors not included in github history ###
@@ -114,7 +114,7 @@ Historic release notes
114114
- Standard streams can be optionally compiled off by defining UNITTEST_USE_CUSTOM_STREAMS
115115
in Config.h
116116
- Added named test suites
117-
- Added CHECK_ARRAY2D_CLOSE
117+
- Added CHECK_ARRAY2D_CLOSE
118118
- Posix library name is libUnitTest++.a now
119119
- Floating point numbers are postfixed with 'f' in the failure reports
120120

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 1.6.0.{build}
1+
version: 1.6.1.{build}
22

33
os:
44
- Windows Server 2012 R2

‎configure.ac‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([UnitTest++], [1.6.0], [pjohnmeyer@gmail.com])
5+
AC_INIT([UnitTest++],
6+
m4_esyscmd_s([git describe --tags | cut -c2-]),
7+
[pjohnmeyer@gmail.com],
8+
[unittest-cpp])
9+
610
AC_CONFIG_SRCDIR([UnitTest++/TestDetails.cpp])
711
AC_CONFIG_MACRO_DIR([m4])
812
AC_CONFIG_HEADERS([config.h])

‎tests/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
check_PROGRAMS = UnitTest++/TestUnitTest++
2-
UnitTest___TestUnitTest___SOURCES = tests/Main.cpp tests/TestAssertHandler.cpp tests/TestCheckMacros.cpp tests/TestChecks.cpp tests/TestCompositeTestReporter.cpp tests/TestCurrentTest.cpp tests/TestDeferredTestReporter.cpp tests/TestExceptions.cpp tests/TestMemoryOutStream.cpp tests/TestRequireMacrosWithExceptionsOff.cpp tests/TestRequireMacrosWithExceptionsOn.cpp tests/TestTest.cpp tests/TestTestList.cpp tests/TestTestMacros.cpp tests/TestTestResults.cpp tests/TestTestRunner.cpp tests/TestTestSuite.cpp tests/TestTimeConstraint.cpp tests/TestTimeConstraintMacro.cpp tests/TestUnitTestPP.cpp tests/TestXmlTestReporter.cpp
2+
3+
UnitTest___TestUnitTest___SOURCES = tests/Main.cpp tests/TestAssertHandler.cpp tests/TestCheckMacros.cpp tests/TestChecks.cpp tests/TestCompositeTestReporter.cpp tests/TestCurrentTest.cpp tests/TestDeferredTestReporter.cpp tests/TestExceptions.cpp tests/TestMemoryOutStream.cpp tests/TestRequireMacrosWithExceptionsOff.cpp tests/TestRequireMacrosWithExceptionsOn.cpp tests/TestTest.cpp tests/TestTestList.cpp tests/TestTestMacros.cpp tests/TestTestResults.cpp tests/TestTestRunner.cpp tests/TestTestSuite.cpp tests/TestTimeConstraint.cpp tests/TestTimeConstraintMacro.cpp tests/TestUnitTestPP.cpp tests/TestXmlTestReporter.cpp tests/RecordingReporter.h tests/ScopedCurrentTest.h
34
UnitTest___TestUnitTest___LDADD = UnitTest++/libUnitTest++.la
45
TESTS = UnitTest++/TestUnitTest++

0 commit comments

Comments
 (0)