fixup! attach to multiple identical probes

tests/codegen.cpp

@@ -13,6 +13,11 @@ namespace test {
 namespace codegen {
 
 using ::testing::_;
+class MockBPFtrace : public BPFtrace {
+public:
+  MOCK_METHOD1(add_probe, int(ast::Probe &p));
+};
+
 
 TEST(codegen, populate_sections)
 {
@@ -94,6 +99,21 @@ void test(const std::string &input, const std::string expected_output)
   EXPECT_EQ(full_expected_output, out.str());
 }
 
+
+TEST(codegen, probe_count)
+{
+  MockBPFtrace bpftrace;
+  EXPECT_CALL(bpftrace, add_probe(_)).Times(2);
+
+  Driver driver;
+
+  ASSERT_EQ(driver.parse_str("kprobe:f { 1; } kprobe:d { 1; }"), 0);
+  ast::SemanticAnalyser semantics(driver.root_, bpftrace);
+  ASSERT_EQ(semantics.analyse(), 0);
+  ast::CodegenLLVM codegen(driver.root_, bpftrace);
+  codegen.compile();
+}
+
 TEST(codegen, empty_function)
 {
   test("kprobe:f { 1; }",

tests/semantic_analyser.cpp

@@ -9,11 +9,6 @@ namespace bpftrace {
 namespace test {
 namespace semantic_analyser {
 
-class MockBPFtrace : public BPFtrace {
-public:
-  MOCK_METHOD1(add_probe, int(ast::Probe &p));
-};
-
 using ::testing::_;
 
 void test(BPFtrace &bpftrace, Driver &driver, const std::string &input, int expected_result=0)
@@ -97,14 +92,6 @@ TEST(semantic_analyser, builtin_functions)
   test("kprobe:f { fake() }", 1);
 }
 
-TEST(semantic_analyser, probe_count)
-{
-  MockBPFtrace bpftrace;
-  EXPECT_CALL(bpftrace, add_probe(_)).Times(2);
-
-  test(bpftrace, "kprobe:f { 1; } kprobe:d { 1; }");
-}
-
 TEST(semantic_analyser, undefined_map)
 {
   test("kprobe:f / @mymap == 123 / { @mymap = 0 }", 0);