Skip to content

Commit

Permalink
fixing paths in headers. (facebookincubator#42)
Browse files Browse the repository at this point in the history
Summary:
as stated. almost everything in testing/ dir using relative paths.
lets move em to absolute. also, after adding pcapwriter, we have now two
version of PcapStructs.h. lets use the one from katran/lib and remove
redundant one

making this a sep PR as requested in facebookincubator#41
Pull Request resolved: facebookincubator#42

Pulled By: udippant

Test Plan:
Imported from GitHub, without a `Test Plan:` line.

I ran unit test locally

Reviewed By: sharma95

Differential Revision: D16861446

fbshipit-source-id: 16761ae790ac39bb6bf19fe9ace4bd306272b290
  • Loading branch information
udippant authored and tehnerd committed Aug 29, 2019
1 parent 506b38b commit 946c9bd
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 49 deletions.
2 changes: 1 addition & 1 deletion katran/lib/testing/Base64Helpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#include "Base64Helpers.h"
#include "katran/lib/testing/Base64Helpers.h"

#include <cstring>

Expand Down
2 changes: 1 addition & 1 deletion katran/lib/testing/Base64Test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <folly/io/IOBuf.h>

#include "Base64Helpers.h"
#include "katran/lib/testing/Base64Helpers.h"

namespace katran {

Expand Down
2 changes: 1 addition & 1 deletion katran/lib/testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ target_link_libraries(base64_helpers
add_library(pcap_parser STATIC
PcapParser.h
PcapParser.cpp
PcapStructs.h
)

target_link_libraries(pcap_parser
base64_helpers
pcapwriter
"${FOLLY}"
"${GLOG}"
"${PTHREAD}"
Expand Down
5 changes: 2 additions & 3 deletions katran/lib/testing/PcapParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#include "PcapParser.h"
#include "katran/lib/testing/PcapParser.h"

#include <chrono>
#include <stdexcept>

#include <folly/FileUtil.h>
#include <glog/logging.h>

#include "Base64Helpers.h"
#include "PcapStructs.h"
#include "katran/lib/testing/Base64Helpers.h"

namespace katran {

Expand Down
2 changes: 1 addition & 1 deletion katran/lib/testing/PcapParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <folly/File.h>
#include <folly/io/IOBuf.h>

#include "PcapStructs.h"
#include "katran/lib/PcapStructs.h"

namespace katran {

Expand Down
41 changes: 0 additions & 41 deletions katran/lib/testing/PcapStructs.h

This file was deleted.

2 changes: 1 addition & 1 deletion katran/lib/testing/XdpTester.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/

#include "XdpTester.h"
#include "katran/lib/testing/XdpTester.h"

#include <iostream>
#include <string>
Expand Down

0 comments on commit 946c9bd

Please sign in to comment.