Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Test ci #1131

Merged
merged 27 commits into from
Jul 18, 2014
Merged

Test ci #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6b127bf
Test to see how CI handles OpenStudio
lefticus May 19, 2014
523be45
Merge branch 'DependencyUpdate' into test_ci
lefticus Jun 18, 2014
97b4f8a
Fix parallel builds on unix to 4 cores for testing
lefticus Jun 18, 2014
337dd8f
Add config for tests subfolder
lefticus Jun 19, 2014
9e50e49
Update ci results path to NREL/OpenStudioBuildResults
lefticus Jun 23, 2014
c62eebc
Preliminary support for MacOS CI.
lefticus Jul 1, 2014
c52fb09
Fix path to results url
lefticus Jul 1, 2014
f30af1e
Set OSX_DEPLOYMENT_TARGET
lefticus Jul 1, 2014
de0c434
Merge remote-tracking branch 'origin/DependencyUpdate' into test_ci
lefticus Jul 1, 2014
057b31d
Attempt to get superbuild qt working on CI
lefticus Jul 1, 2014
f15ff86
Remove parallel job limiter on macos
lefticus Jul 2, 2014
d347dfc
Add Luigi to pull request notifications
lefticus Jul 5, 2014
f5715c1
Enable Windows CI build support
lefticus Jul 5, 2014
15c5ed7
Clean up cppcheck arguments
lefticus Jul 5, 2014
9ea3efa
Suppress some cppcheck warnings internal to code
lefticus Jul 5, 2014
4778c21
Suppress cppcheck syntax errors
lefticus Jul 6, 2014
b371ed3
Touch .decent_ci.yaml to cause CI build of branch
lefticus Jul 9, 2014
fa08362
Merge remote-tracking branch 'origin/develop' into test_ci
lefticus Jul 10, 2014
22f4a7e
Merge remote-tracking branch 'origin/develop' into test_ci
lefticus Jul 11, 2014
278d6ce
Make sure BUILD_SWIG is enabled for CI
lefticus Jul 12, 2014
1ee9f44
Merge branch 'develop' of https://github.com/NREL/OpenStudio into tes…
lefticus Jul 14, 2014
dcb9035
Change ci settings for windows / linux.
lefticus Jul 15, 2014
3da212c
Let linux use default number of cpus
lefticus Jul 15, 2014
037417e
Disable linux gcc builds
lefticus Jul 16, 2014
102b3f2
Merge remote-tracking branch 'origin/develop' into test_ci
lefticus Jul 16, 2014
4ea7389
Remove explicit "build boost" in ci config
lefticus Jul 16, 2014
e3d5429
Disable PCH on windows, it appears to be broken
lefticus Jul 17, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .decent_ci-Linux.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
compilers:
# - name: "gcc"
# version: "4.8"
# cmake_extra_flags: -DBUILD_TESTING:BOOL=ON -DBUILD_SWIG:BOOL=ON
- name: cppcheck
compiler_extra_flags: --enable=warning --suppress="*:*zlib*" --suppress="*:*sqlite*" --suppress="cppcheckError:*" --inline-suppr --suppress="syntaxError:*"
4 changes: 4 additions & 0 deletions .decent_ci-MacOS.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
compilers:
- name: clang
cmake_extra_flags: -DBUILD_TESTING:BOOL=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DBUILD_SWIG:BOOL=ON

6 changes: 6 additions & 0 deletions .decent_ci-Windows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
compilers:
- name: Visual Studio
version: 12
cmake_extra_flags: -DBUILD_TESTING:BOOL=ON -DBUILD_SWIG:BOOL=ON -DBUILD_QT:BOOL=OFF -DBUILD_RUBY:BOOL=ON


9 changes: 9 additions & 0 deletions .decent_ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
results_repository : NREL/OpenStudioBuildResults
results_path : _posts
results_base_url : https://nrel.github.io/OpenStudioBuildResults
tests_dir : OpenStudioCore-prefix/src/OpenStudioCore-build
notification_recipients:
- lgentile
aging_pull_requests_notification: true


3 changes: 3 additions & 0 deletions openstudiocore/src/utilities/data/CalibrationResult.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ namespace openstudio {
return boost::none;
}
try{
// cppcheck-suppress unusedScopedObject
Date(test->valueAsString());
}catch(const std::exception&){
LOG(Warn,"Cannot create CalibrationBillingPeriod from Attribute with improper 'startDate'.");
Expand Down Expand Up @@ -269,6 +270,7 @@ namespace openstudio {
return boost::none;
}
try{
// cppcheck-suppress unusedScopedObject
FuelType(test->valueAsString());
}catch(const std::exception&){
LOG(Warn,"Cannot create CalibrationUtilityBill from Attribute with improper 'fuelType'.");
Expand All @@ -281,6 +283,7 @@ namespace openstudio {
return boost::none;
}
try{
// cppcheck-suppress unusedScopedObject
InstallLocationType(test->valueAsString());
}catch(const std::exception&){
LOG(Warn,"Cannot create CalibrationUtilityBill from Attribute with improper 'meterInstallLocation'.");
Expand Down
7 changes: 7 additions & 0 deletions openstudiocore/src/utilities/idd/Test/CommentRegex_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ TEST_F(IddFixture,CommentRegex_Lines) {
line = " \t\t !-IdfEditor-style comments are ok too.";
EXPECT_TRUE(boost::regex_match(line,matches,commentWhitespaceOnlyLine()));
ASSERT_EQ(static_cast<unsigned>(2),matches.size());
// cppcheck-suppress arrayIndexOutOfBounds
match = std::string(matches[1].first,matches[1].second);
EXPECT_EQ("-IdfEditor-style comments are ok too.",match);

line = " !- One last boring comment, with some math: 1 + 1 = (1^1)*2.";
EXPECT_TRUE(boost::regex_match(line,matches,commentWhitespaceOnlyLine()));
ASSERT_EQ(static_cast<unsigned>(2),matches.size());
// cppcheck-suppress arrayIndexOutOfBounds
match = std::string(matches[1].first,matches[1].second);
EXPECT_EQ("- One last boring comment, with some math: 1 + 1 = (1^1)*2.",match);

Expand All @@ -113,20 +115,23 @@ TEST_F(IddFixture,CommentRegex_Lines) {
EXPECT_FALSE(matches.empty());
ASSERT_EQ(static_cast<unsigned>(2),matches.size());
EXPECT_TRUE(matches[0].matched);
// cppcheck-suppress arrayIndexOutOfBounds
EXPECT_FALSE(matches[1].matched);

line = " \t \t";
EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
EXPECT_FALSE(matches.empty());
ASSERT_EQ(static_cast<unsigned>(2),matches.size());
EXPECT_TRUE(matches[0].matched);
// cppcheck-suppress arrayIndexOutOfBounds
EXPECT_FALSE(matches[1].matched);

line = " ";
EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
EXPECT_FALSE(matches.empty());
ASSERT_EQ(static_cast<unsigned>(2),matches.size());
EXPECT_TRUE(matches[0].matched);
// cppcheck-suppress arrayIndexOutOfBounds
EXPECT_FALSE(matches[1].matched);

line = " \t !A plain comment, no space";
Expand All @@ -138,12 +143,14 @@ TEST_F(IddFixture,CommentRegex_Lines) {
line = " \t\t !-IdfEditor-style comments are ok too.";
EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
ASSERT_EQ(static_cast<unsigned>(2),matches.size());
// cppcheck-suppress arrayIndexOutOfBounds
match = std::string(matches[1].first,matches[1].second);
EXPECT_EQ("IdfEditor-style comments are ok too.",match);

line = " !- One last boring comment, with some math: 1 + 1 = (1^1)*2.";
EXPECT_TRUE(boost::regex_match(line,matches,editorCommentWhitespaceOnlyLine()));
ASSERT_EQ(static_cast<unsigned>(2),matches.size());
// cppcheck-suppress arrayIndexOutOfBounds
match = std::string(matches[1].first,matches[1].second);
EXPECT_EQ(" One last boring comment, with some math: 1 + 1 = (1^1)*2.",match);

Expand Down
1 change: 1 addition & 0 deletions openstudiocore/src/utilities/idd/Test/IddField_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,6 @@ TEST_F(IddFixture, IddField) {
fields[3].print(ss,false);
OptionalIddField fieldClone = IddField::load(fields[3].name(),ss.str(),"Lights");
ASSERT_TRUE(fieldClone);
// cppcheck-suppress arrayIndexOutOfBounds
EXPECT_EQ(fields[3],*fieldClone);
}