From d331d39e93ed7696c5c31a1dbe2287c2e80936d5 Mon Sep 17 00:00:00 2001
From: Robert Olsson <robert@herjulf.se>
Date: Sat, 14 May 2016 22:48:09 +0200
Subject: [PATCH] Correct paths when moving examples for regession tests

---
 examples/avr-rss2/avr_radio_power/Makefile        | 2 +-
 examples/avr-rss2/hello-sensors/Makefile          | 2 +-
 examples/avr-rss2/ipv6/dc-rpl-coap/Makefile       | 2 +-
 examples/avr-rss2/ipv6/rpl-border-router/Makefile | 2 +-
 examples/avr-rss2/ipv6/rpl-udp-report/Makefile    | 2 +-
 examples/avr-rss2/ipv6/sensd_client/Makefile      | 2 +-
 regression-tests/23-compile-avr/Makefile          | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/avr-rss2/avr_radio_power/Makefile b/examples/avr-rss2/avr_radio_power/Makefile
index fb9b062a1..abaab89f1 100644
--- a/examples/avr-rss2/avr_radio_power/Makefile
+++ b/examples/avr-rss2/avr_radio_power/Makefile
@@ -4,6 +4,6 @@ CONTIKI_PROJECT = avr_radio_power
 APPS+=powertrace
 all: $(CONTIKI_PROJECT)
 
-CONTIKI = ../../../..
+CONTIKI = ../../..
 CONTIKI_WITH_RIME = 1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/avr-rss2/hello-sensors/Makefile b/examples/avr-rss2/hello-sensors/Makefile
index c6e0da805..0d1d41b9f 100644
--- a/examples/avr-rss2/hello-sensors/Makefile
+++ b/examples/avr-rss2/hello-sensors/Makefile
@@ -15,5 +15,5 @@ CUSTOM_RULE_LINK = 1
 
 
 
-CONTIKI = ../../../..
+CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile b/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
index 9d8bccece..46a7e9c3f 100644
--- a/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
+++ b/examples/avr-rss2/ipv6/dc-rpl-coap/Makefile
@@ -2,7 +2,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 all: coap-client coap-server
 APPS=servreg-hack
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 ifdef WITH_COMPOWER
 APPS+=powertrace
diff --git a/examples/avr-rss2/ipv6/rpl-border-router/Makefile b/examples/avr-rss2/ipv6/rpl-border-router/Makefile
index ba3f16af6..630d9dd53 100644
--- a/examples/avr-rss2/ipv6/rpl-border-router/Makefile
+++ b/examples/avr-rss2/ipv6/rpl-border-router/Makefile
@@ -1,7 +1,7 @@
 CONTIKI_PROJECT=border-router
 all: $(CONTIKI_PROJECT) 
 
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 #linker optimizations
 SMALL=1
diff --git a/examples/avr-rss2/ipv6/rpl-udp-report/Makefile b/examples/avr-rss2/ipv6/rpl-udp-report/Makefile
index 770ad3749..f4c90317e 100644
--- a/examples/avr-rss2/ipv6/rpl-udp-report/Makefile
+++ b/examples/avr-rss2/ipv6/rpl-udp-report/Makefile
@@ -3,7 +3,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 all: report sink
 APPS=servreg-hack
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 ifdef WITH_COMPOWER
 APPS+=powertrace
diff --git a/examples/avr-rss2/ipv6/sensd_client/Makefile b/examples/avr-rss2/ipv6/sensd_client/Makefile
index c0eabf9b0..f1b0d7d48 100644
--- a/examples/avr-rss2/ipv6/sensd_client/Makefile
+++ b/examples/avr-rss2/ipv6/sensd_client/Makefile
@@ -2,7 +2,7 @@
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 all: sensd_client server
-CONTIKI=../../../../..
+CONTIKI=../../../..
 
 ifdef PERIOD
 CFLAGS+=-DPERIOD=$(PERIOD)
diff --git a/regression-tests/23-compile-avr/Makefile b/regression-tests/23-compile-avr/Makefile
index 0904e2f37..56cef07d3 100644
--- a/regression-tests/23-compile-avr/Makefile
+++ b/regression-tests/23-compile-avr/Makefile
@@ -4,9 +4,9 @@ TOOLSDIR=../../tools
 # build avr-rss2 examples, covering IPv6, RPL, Rime, Nullrdc, Contikimac
 
 EXAMPLES = \
-platform/avr-rss2/examples/hello-sensors/avr-rss2 \
-platform/avr-rss2/examples/ipv6/rpl-udp-report/avr-rss2 \
-platform/avr-rss2/examples/ipv6/rpl-border-router/avr-rss2 \
+examples/avr-rss2/hello-sensors/avr-rss2 \
+examples/avr-rss2/ipv6/rpl-udp-report/avr-rss2 \
+examples/avr-rss2/ipv6/rpl-border-router/avr-rss2 \
 examples/ipv6/rpl-udp/avr-rss2 \
 examples/powertrace/avr-rss2 \
 examples/rime/avr-rss2