commit 0dce41c2ece9020d5ac9bb68c9772432fac85e64
author Louis Yung-Chieh Lo <yjlou@chromium.org> Mon May 17 22:45:30 2010 -0700
committer Louis Yung-Chieh Lo <yjlou@chromium.org> Mon May 17 22:45:30 2010 -0700
tree 554e3638deb52a69dfe4d434baa16ee191aabe2c
parent b17db3c4b9e7051e51af72bfd404d3d243b44f5c

rename cgpt files with cgptlib prefix (to avoid conflicts to cgpt utility)

Review URL: http://codereview.chromium.org/2082007

cgptlib/tests/Makefile

diff --git a/cgptlib/tests/Makefile b/cgptlib/tests/Makefile
index 60871fa..57b7bec 100644
--- a/cgptlib/tests/Makefile
+++ b/cgptlib/tests/Makefile
@@ -2,11 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-CC ?= cc
-CFLAGS ?= -Wall -DNDEBUG -Werror -ansi
+CFLAGS += -Wall -DNDEBUG -Werror -ansi
 LIBS = ../cgpt.a ../../common/libcommon.a
-OBJS = cgpt_test.o
-OUT = cgpt_test
+OBJS = cgptlib_test.o quick_sort_test.o
+OUT = cgptlib_test
 
 all: $(OUT)
 

cgptlib/tests/cgptlib_test.c

diff --git a/cgptlib/tests/cgpt_test.c b/cgptlib/tests/cgptlib_test.c
similarity index 99%
rename from cgptlib/tests/cgpt_test.c
rename to cgptlib/tests/cgptlib_test.c
index 964232d..b725749 100644
--- a/cgptlib/tests/cgpt_test.c
+++ b/cgptlib/tests/cgptlib_test.c
@@ -3,10 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include "cgpt_test.h"
+#include "cgptlib_test.h"
 #include <string.h>
-#include "cgpt.h"
-#include "cgpt_internal.h"
+#include "cgptlib.h"
+#include "cgptlib_internal.h"
 #include "crc32.h"
 #include "gpt.h"
 #include "quick_sort_test.h"

cgptlib/tests/cgptlib_test.h

diff --git a/cgptlib/tests/cgpt_test.h b/cgptlib/tests/cgptlib_test.h
similarity index 84%
rename from cgptlib/tests/cgpt_test.h
rename to cgptlib/tests/cgptlib_test.h
index 3a4191a..9812e77 100644
--- a/cgptlib/tests/cgpt_test.h
+++ b/cgptlib/tests/cgptlib_test.h
@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef VBOOT_REFERENCE_CGPT_TEST_H_
-#define VBOOT_REFERENCE_CGPT_TEST_H_
+#ifndef VBOOT_REFERENCE_CGPTLIB_TEST_H_
+#define VBOOT_REFERENCE_CGPTLIB_TEST_H_
 
 #include <stdio.h>
 
@@ -31,4 +31,4 @@
     } \
   } while (0)
 
-#endif  /* VBOOT_REFERENCE_CGPT_TEST_H_ */
+#endif  /* VBOOT_REFERENCE_CGPTLIB_TEST_H_ */

cgptlib/tests/quick_sort_test.c

diff --git a/cgptlib/tests/quick_sort_test.c b/cgptlib/tests/quick_sort_test.c
index 325c2fa..d63d08b 100644
--- a/cgptlib/tests/quick_sort_test.c
+++ b/cgptlib/tests/quick_sort_test.c
@@ -4,7 +4,7 @@
  */
 
 #include "quick_sort_test.h"
-#include "cgpt_test.h"
+#include "cgptlib_test.h"
 #include "quick_sort.h"
 #include "utility.h"