Merge pull request #592 from intel-go/gregory/quickfix

Implemented #567. Moved "low" under "internal" sub-package.
aregm · Apr 9, 2019 · e887c40 · e887c40
2 parents 6f8a1d3 + 16209ba
commit e887c40
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 PATH_TO_MK = mk
 SUBDIRS = nff-go-base dpdk test examples
 DOC_TARGETS = flow packet
-CI_TESTING_TARGETS = packet low common
+CI_TESTING_TARGETS = packet internal/low common
 TESTING_TARGETS = $(CI_TESTING_TARGETS) test/stability
 
 all: $(SUBDIRS)

diff --git a/flow/counters.go b/flow/counters.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"github.com/intel-go/nff-go/common"
-	"github.com/intel-go/nff-go/low"
+	"github.com/intel-go/nff-go/internal/low"
 )
 
 const (

diff --git a/flow/flow.go b/flow/flow.go
@@ -38,7 +38,7 @@ import (
 
 	"github.com/intel-go/nff-go/asm"
 	"github.com/intel-go/nff-go/common"
-	"github.com/intel-go/nff-go/low"
+	"github.com/intel-go/nff-go/internal/low"
 	"github.com/intel-go/nff-go/packet"
 	"github.com/intel-go/nff-go/types"
 )

diff --git a/flow/scheduler.go b/flow/scheduler.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/intel-go/nff-go/common"
-	"github.com/intel-go/nff-go/low"
+	"github.com/intel-go/nff-go/internal/low"
 )
 
 const generatePauseStep = 0.1

diff --git a/low/Makefile → internal/low/Makefile b/low/Makefile → internal/low/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-PATH_TO_MK = ../mk
+PATH_TO_MK = ../../mk
 include $(PATH_TO_MK)/include.mk
 
 .PHONY: testing

diff --git a/low/low.go → internal/low/low.go b/low/low.go → internal/low/low.go
diff --git a/low/low.h → internal/low/low.h b/low/low.h → internal/low/low.h
diff --git a/low/low_test.go → internal/low/low_test.go b/low/low_test.go → internal/low/low_test.go
diff --git a/packet/checksum.go b/packet/checksum.go
@@ -7,7 +7,7 @@ package packet
 import (
 	"unsafe"
 
-	"github.com/intel-go/nff-go/low"
+	"github.com/intel-go/nff-go/internal/low"
 	. "github.com/intel-go/nff-go/types"
 )
 

diff --git a/packet/packet.go b/packet/packet.go
@@ -46,7 +46,7 @@ import (
 	"unsafe"
 
 	. "github.com/intel-go/nff-go/common"
-	"github.com/intel-go/nff-go/low"
+	"github.com/intel-go/nff-go/internal/low"
 	"github.com/intel-go/nff-go/types"
 )
 

diff --git a/packet/pcap_utils.go b/packet/pcap_utils.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/intel-go/nff-go/common"
-	"github.com/intel-go/nff-go/low"
+	"github.com/intel-go/nff-go/internal/low"
 )
 
 type nowFuncT func() time.Time

diff --git a/packet/utils_for_test.go b/packet/utils_for_test.go
@@ -8,7 +8,7 @@ import (
 	"net"
 	"os"
 
-	"github.com/intel-go/nff-go/low"
+	"github.com/intel-go/nff-go/internal/low"
 	"github.com/intel-go/nff-go/types"
 )