Skip to content

Commit 9a8ccd7

Browse files
committed
RDKB-59859: Add TestSuite compilation
Reason for change: Add TestSuite compilation Test Procedure: Risks: Low Priority: P1 Signed-off-by: YuriyMasechko <[email protected]>
1 parent b0ddcc6 commit 9a8ccd7

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

build/openwrt/Makefile_package

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ define Package/easymesh
1010
SECTION:=base
1111
CATEGORY:=Base system
1212
TITLE:=EasyMesh
13-
DEPENDS:=+avro-c +libopenssl +cJSON +libev +libnl +libnl-genl +libnl-route +libuuid +libstdcpp +libmariadb
13+
DEPENDS:=+avro-c +libopenssl +cJSON +libev +libnl +libnl-genl +libnl-route +libuuid +libstdcpp +libmariadb +libpcap +libcurl
1414
endef
1515

1616
define Package/easymesh/description
@@ -28,8 +28,11 @@ define Build/Prepare
2828
$(CP) -r ./halinterface $(PKG_BUILD_DIR)/
2929
$(CP) -r ./rdk-wifi-hal $(PKG_BUILD_DIR)/
3030
$(CP) -r ./rdk-wifi-libhostap $(PKG_BUILD_DIR)/
31+
$(CP) -r ./OneWifiTestSuite $(PKG_BUILD_DIR)/
3132
$(CP) -r ./OneWifi/install $(PKG_BUILD_DIR)/
3233
$(CP) -r ./OneWifi/install/bin $(PKG_BUILD_DIR)/
34+
$(CP) -r ./OneWifiTestSuite/install/bin $(PKG_BUILD_DIR)/
35+
$(CP) -r ./OneWifiTestSuite/install/bin $(PKG_BUILD_DIR)/
3336
endef
3437

3538
define Build/Compile
@@ -38,6 +41,12 @@ define Build/Compile
3841
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/OneWifi/build/openwrt/ \
3942
$(TARGET_CONFIGURE_OPTS)
4043

44+
echo "Compiling OneWifiTestSuite..."
45+
rm -rf $(PKG_BUILD_DIR)/rdk-wifi-hal/src/*.o
46+
CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
47+
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/OneWifiTestSuite/build/openwrt/ \
48+
$(TARGET_CONFIGURE_OPTS)
49+
4150
echo "Compiling Easymesh AGENT..."
4251
CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(STAGING_DIR)" \
4352
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/unified-wifi-mesh/build/openwrt/agent/ \
@@ -55,6 +64,7 @@ define Package/easymesh/install
5564
$(INSTALL_BIN) $(PKG_BUILD_DIR)/unified-wifi-mesh/install/bin/onewifi_em_agent $(1)/usr/bin/
5665
$(INSTALL_BIN) $(PKG_BUILD_DIR)/unified-wifi-mesh/install/bin/onewifi_em_ctrl $(1)/usr/bin/
5766
$(INSTALL_BIN) $(PKG_BUILD_DIR)/OneWifi/install/bin/OneWifi $(1)/usr/bin/
67+
$(INSTALL_BIN) $(PKG_BUILD_DIR)/OneWifiTestSuite/install/bin/cci $(1)/usr/bin/
5868
endef
5969

6070
$(eval $(call BuildPackage,easymesh))

build/openwrt/setup.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@ cd $ONEWIFI_DIR
1313
mkdir -p install/bin
1414
mkdir -p install/lib
1515

16+
#git clone test suite
17+
cd ..
18+
git clone ssh://gerrit.teamccp.com:29418/rdk/components/cpc/OneWifiTestSuite
19+
cd OneWifiTestSuite/
20+
git checkout origin/25Q2_sprint
21+
cp build/openwrt/patches/* ../../../package/kernel/mt76/patches/
22+
git clone http://github.com/yhirose/cpp-httplib
23+
cd cpp-httplib
24+
git checkout 9bbb4741b4f7c8fc5083c8a56d8d301a8abc25a3
25+
cp httplib.h ../src/external_agent_cci/ext_inc/
26+
cd ..
27+
rm -rf cpp-httplib
28+
cd $ONEWIFI_DIR
1629

1730
#Check if the HOSTAP_DIR already present before creating
1831
if [ -d "$HOSTAP_DIR" ]; then

0 commit comments

Comments
 (0)