Merge pull request #325 from theasianpianist/msft-ssg-cstr

[ssg]: Use C++ strings for text handling (#18596)
sonic-net · Apr 9, 2024 · bd02b87 · bd02b87
2 parents 6bfb85a + 1e1876a
commit bd02b87
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 177 deletions.
diff --git a/src/systemd-sonic-generator/Makefile b/src/systemd-sonic-generator/Makefile
@@ -2,15 +2,15 @@ CC=gcc
 CFLAGS += -std=gnu99 -D_GNU_SOURCE
 
 CXX=g++
-CXXFLAGS += -std=c++11 -D_GNU_SOURCE
-LDFLAGS += -lpthread -lboost_filesystem -lboost_system -lgtest
+CXXFLAGS += -std=c++11 -D_GNU_SOURCE -I ./
+LDFLAGS += -l stdc++ -lpthread -lboost_filesystem -lboost_system -lgtest
 
 BINARY = systemd-sonic-generator
 
-$(BINARY): systemd-sonic-generator.c
+$(BINARY): systemd-sonic-generator.cpp
 	rm -f ./systemd-sonic-generator
 
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 
 install: $(BINARY)
 	mkdir -p $(DESTDIR)
@@ -24,10 +24,12 @@ test: ssg_test
 	./ssg_test
 
 ssg_test: ssg-test.cc systemd-sonic-generator.o
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) -ggdb -o $@ $^ $(LDFLAGS)
+
+systemd-sonic-generator.o: systemd-sonic-generator.cpp
+	$(CXX) $(CXXFLAGS) -ggdb -D_SSG_UNITTEST -o $@ -c $^
 
-systemd-sonic-generator.o: systemd-sonic-generator.c
-	$(CC) $(CFLAGS) -D_SSG_UNITTEST -o $@ -c $^
+all: $(BINARY) test
 
 clean:
 	rm -f ./systemd-sonic-generator

diff --git a/src/systemd-sonic-generator/ssg-test.cc b/src/systemd-sonic-generator/ssg-test.cc
@@ -181,8 +181,7 @@ class SsgMainTest : public SsgFunctionTest {
 
     /* Find a string in a file */
     bool find_string_in_file(std::string str,
-                             std::string file_name,
-                             int num_asics) {
+                             std::string file_name) {
         bool found = false;
             std::string line;
 
@@ -214,7 +213,7 @@ class SsgMainTest : public SsgFunctionTest {
                     /* Run once for single instance */
                     finished = true;
                 }
-                EXPECT_EQ(find_string_in_file(str_t, target, num_asics),
+                EXPECT_EQ(find_string_in_file(str_t, target),
                         expected_result)
                         << "Error validating " + str_t + " in " + target;
             }
@@ -460,9 +459,8 @@ TEST_F(SsgFunctionTest, insert_instance_number) {
     char input[] = "test@.service";
     for (int i = 0; i <= 100; ++i) {
         std::string out = "test@" + std::to_string(i) + ".service";
-        char* ret = insert_instance_number(input, i);
-        ASSERT_NE(ret, nullptr);
-        EXPECT_STREQ(ret, out.c_str());
+        std::string ret = insert_instance_number(input, i);
+        EXPECT_EQ(ret, out);
     }
 }
 
@@ -513,7 +511,6 @@ TEST_F(SsgFunctionTest, get_unit_files) {
 
 /* TEST ssg_main() argv error */
 TEST_F(SsgMainTest, ssg_main_argv) {
-        FILE* fp;
         std::vector<char*> argv_;
         std::vector<std::string> arguments = {
                     "ssg_main",