Unittest basics #10
Merged
Unittest basics #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
tallytalwar
commented
Sep 23, 2014
tallytalwar
commented
- Updated Makefile.
- Added Catch unit testing framework support.
- Added some basic unit tests for dataSource.
- Other small changes
… jsoncpp file and enabled curl linking
…pulation func to header.
| return std::move(url); | ||
| } | ||
|
|
||
| //TODO: Use regex to do this better. |
There was a problem hiding this comment.
Yeah this is begging for regex haha
There was a problem hiding this comment.
Ya TODO :(... Will do all this in one go, after I am done reading on c++11 regex functionalities.
|
Cool, using Catch looks really easy! I don't see any outstanding issues |
| @@ -34,10 +55,13 @@ OSX_FRAMEWORKS= \ | |||
| -framework CoreVideo | |||
| OSX_INCLUDES= \ | |||
| -Icore \ | |||
| -Icore/include | |||
| -Icore/include \ | |||
| -lcurl | |||
There was a problem hiding this comment.
System libraries aren't strictly includes, might deserve another variable even though it's just one item right now
… not have spaces). Added dependencies to osx-test and added mkdir for build directories
| @@ -51,6 +77,20 @@ ios: | |||
| xcodebuild -workspace ios/TangramiOS.xcworkspace -scheme TangramiOS -destination 'platform=iOS Simulator,name=iPhone Retina (3.5-inch)' | |||
|
|
|||
| osx/bin/TangramOSX: $(OSX_SRC_FILES) | |||
| clang++ -o osx/bin/TangramOSX $(CORE_SRC_FILES) $(OSX_SRC_FILES) $(OSX_INCLUDES) $(OSX_FRAMEWORKS) -DPLATFORM_OSX -lglfw3 -std=c++11 -g | |||
| mkdir -p osx/bin | |||
| clang++ -o osx/bin/TangramOSX $(CORE_SRC_FILES) $(OSX_SRC_FILES) $(LIB_DEPENDENCY) $(OSX_INCLUDES) $(OSX_EXTERNAL_LIB) $(OSX_FRAMEWORKS) -DPLATFORM_OSX -lglfw3 -std=c++11 | |||
There was a problem hiding this comment.
One last tiny thing: Can you put -lglfw3 in OSX_EXTERNAL_LIB with -lcurl ? It's in each of the clang commands
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.