X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=server%2FIptablesBaseTest.h;h=d175c5bc2541e93ada297b035c99e1b444024e8e;hb=8e1cee9064af5b2e0d8095d5a6a05953616d7d4c;hp=a354ef2b9fbe8910fb8b153b0f1d4b6cda94bde4;hpb=bbeaf9a4d272eefb11748d7d40c6bd117ab468fb;p=android-x86%2Fsystem-netd.git

diff --git a/server/IptablesBaseTest.h b/server/IptablesBaseTest.h
index a354ef2..d175c5b 100644
--- a/server/IptablesBaseTest.h
+++ b/server/IptablesBaseTest.h
@@ -27,11 +27,13 @@ public:
     typedef std::vector<std::pair<IptablesTarget, std::string>> ExpectedIptablesCommands;
 
     static int fake_android_fork_exec(int argc, char* argv[], int *status, bool, bool);
+    static int fake_android_fork_execvp(int argc, char* argv[], int *status, bool, bool);
     static int fakeExecIptables(IptablesTarget target, ...);
     static int fakeExecIptablesRestore(IptablesTarget target, const std::string& commands);
     static FILE *fake_popen(const char *cmd, const char *type);
     void expectIptablesCommands(const std::vector<std::string>& expectedCmds);
     void expectIptablesCommands(const ExpectedIptablesCommands& expectedCmds);
+    void expectIptablesCommands(const std::vector<ExpectedIptablesCommands>& snippets);
     void expectIptablesRestoreCommands(const std::vector<std::string>& expectedCmds);
     void expectIptablesRestoreCommands(const ExpectedIptablesCommands& expectedCmds);