Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
libcifpp
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
libcifpp
Commits
40250509
Commit
40250509
authored
Oct 07, 2020
by
Maarten L. Hekkelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Work around limitation in travis-ci
parent
e8d8b8be
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
.travis.yml
+3
-3
GNUmakefile.in
+6
-0
test/unit-test.cpp
+0
-4
No files found.
.travis.yml
View file @
40250509
...
@@ -24,9 +24,9 @@ before_install:
...
@@ -24,9 +24,9 @@ before_install:
script
:
script
:
-
./configure
-
./configure
-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake
; else make
; fi
-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake
NO_REVISION=1 ; else make NO_REVISION=1
; fi
-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake test
; else make test
; fi
-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake test
NO_REVISION=1 ; else make test NO_REVISION=1
; fi
-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo gmake
install; else sudo make install
; fi
-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo gmake
NO_REVISION=1 install; else sudo make install NO_REVISION=1
; fi
jobs
:
jobs
:
allow_failures
:
allow_failures
:
...
...
GNUmakefile.in
View file @
40250509
...
@@ -135,10 +135,16 @@ endif
...
@@ -135,10 +135,16 @@ endif
REVISION
=
$(
shell
git log
--pretty
=
format:%h
--max-count
=
1
)
REVISION
=
$(
shell
git log
--pretty
=
format:%h
--max-count
=
1
)
REVISION_FILE
=
version-info-
$(REVISION)
.txt
REVISION_FILE
=
version-info-
$(REVISION)
.txt
# Unfortunately, travis-ci checks out only with --depth=50, missing the required tag
ifeq
"$(NO_REVISION)"
""
$(REVISION_FILE)
:
$(REVISION_FILE)
:
rm
-f
version-info-
*
.txt
rm
-f
version-info-
*
.txt
git describe
--match
=
build
--dirty
>
$@
git describe
--match
=
build
--dirty
>
$@
@
git log
--pretty
=
medium
--date
=
iso8601
-1
>>
$@
@
git log
--pretty
=
medium
--date
=
iso8601
-1
>>
$@
else
$(REVISION_FILE)
:
touch
$@
endif
src/revision.hpp
:
$(REVISION_FILE)
src/revision.hpp
:
$(REVISION_FILE)
@
echo
'const char kRevision[] = R"('
>
$@
@
echo
'const char kRevision[] = R"('
>
$@
...
...
test/unit-test.cpp
View file @
40250509
...
@@ -834,8 +834,6 @@ _cat_2.parent_id3
...
@@ -834,8 +834,6 @@ _cat_2.parent_id3
BOOST_CHECK
(
cat2
.
find
(
cif
::
Key
(
"parent_id"
)
==
4
).
size
()
==
3
);
BOOST_CHECK
(
cat2
.
find
(
cif
::
Key
(
"parent_id"
)
==
4
).
size
()
==
3
);
BOOST_CHECK
(
cat2
.
find
(
cif
::
Key
(
"parent_id"
)
==
40
).
size
()
==
0
);
BOOST_CHECK
(
cat2
.
find
(
cif
::
Key
(
"parent_id"
)
==
40
).
size
()
==
0
);
f
.
write
(
std
::
cout
,
{});
}
}
// --------------------------------------------------------------------
// --------------------------------------------------------------------
...
@@ -993,8 +991,6 @@ _cat_2.parent_id3
...
@@ -993,8 +991,6 @@ _cat_2.parent_id3
break
;
break
;
}
}
f
.
write
(
std
::
cout
,
{});
BOOST_CHECK
(
cat1
.
size
()
==
3
);
BOOST_CHECK
(
cat1
.
size
()
==
3
);
BOOST_CHECK
(
cat2
.
size
()
==
7
);
BOOST_CHECK
(
cat2
.
size
()
==
7
);
...
...
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