Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Iccta #3

Merged
merged 8 commits into from
Apr 25, 2014
Merged

Iccta #3

merged 8 commits into from
Apr 25, 2014

Conversation

lilicoding
Copy link
Contributor

merge DroidBench2.0 (all the test cases are developed for ICC or IAC leaks).

lilicoding added a commit that referenced this pull request Apr 25, 2014
@lilicoding lilicoding merged commit 2410f0d into master Apr 25, 2014
@StevenArzt
Copy link
Member

Please do not directly merge pull requests without asking one of us who maintain this repository. New contributions should always go into the "develop" branch, not into "master". This gives us the opportunity to first collect new test applications and organize them, before going "official" with them. Additionally,there is a plan how we release new versions of DroidBench that includes updating the README file, giving it a version number people can refer to when using it, announcing it on our blog, etc.

@ericbodden
Copy link
Member

+1
Should we undo the merge for the master branch?

@StevenArzt
Copy link
Member

This would be the best solution, I think. @lilicoding can then open a new pull request and I can properly integrate the new applications into the DroidBench develop branch. I have seen that there are descriptive XML files for the new apps which is a good idea, but if we chose to have that, we should have it for all applications (i.e., for the old ones as well). I can do that, but this is another reason for going back for the time being before we have that sorted out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants